[pypy-svn] r72554 - in pypy/trunk/pypy: rpython/lltypesystem/test translator/c/src

arigo at codespeak.net arigo at codespeak.net
Mon Mar 22 14:46:47 CET 2010


Author: arigo
Date: Mon Mar 22 14:46:46 2010
New Revision: 72554

Removed:
   pypy/trunk/pypy/translator/c/src/standalone.h
Modified:
   pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py
   pypy/trunk/pypy/translator/c/src/allocator.h
   pypy/trunk/pypy/translator/c/src/g_include.h
Log:
Move stuff around the .h files, in order to fix test_rffi.


Modified: pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py
==============================================================================
--- pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py	(original)
+++ pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py	Mon Mar 22 14:46:46 2010
@@ -85,6 +85,7 @@
     def test_string_reverse(self):
         c_source = py.code.Source("""
         #include <string.h>
+        #include <src/allocator.h>
         #include <src/mem.h>
 
         char *f(char* arg)

Modified: pypy/trunk/pypy/translator/c/src/allocator.h
==============================================================================
--- pypy/trunk/pypy/translator/c/src/allocator.h	(original)
+++ pypy/trunk/pypy/translator/c/src/allocator.h	Mon Mar 22 14:46:46 2010
@@ -1,4 +1,10 @@
 
+/* allocation functions prototypes */
+void *PyObject_Malloc(size_t n);
+void *PyObject_Realloc(void *p, size_t n);
+void PyObject_Free(void *p);
+
+
 #ifndef PYPY_NOT_MAIN_FILE
 #ifdef AVR
    #ifndef NO_OBMALLOC

Modified: pypy/trunk/pypy/translator/c/src/g_include.h
==============================================================================
--- pypy/trunk/pypy/translator/c/src/g_include.h	(original)
+++ pypy/trunk/pypy/translator/c/src/g_include.h	Mon Mar 22 14:46:46 2010
@@ -11,7 +11,9 @@
 #  include "marshal.h"
 #  include "eval.h"
 #else
-#  include "src/standalone.h"
+#  include <stdlib.h>
+#  include <assert.h>
+#  include <math.h>
 #endif
 
 #include "src/mem.h"



More information about the Pypy-commit mailing list