Author: Philip Jenvey <[email protected]>
Branch:
Changeset: r74240:431cebffcb39
Date: 2014-10-25 22:31 -0700
http://bitbucket.org/pypy/pypy/changeset/431cebffcb39/
Log: backout 673f241, -Ojit fails without the .h
diff --git a/pypy/module/operator/tscmp.c b/pypy/module/operator/tscmp.c
--- a/pypy/module/operator/tscmp.c
+++ b/pypy/module/operator/tscmp.c
@@ -1,9 +1,10 @@
/* Derived from CPython 3.3.5's operator.c::_tscmp
*/
+#include "src/precommondefs.h"
#include <stdlib.h>
#include <wchar.h>
-#include "src/precommondefs.h"
+#include "tscmp.h"
RPY_EXPORTED_FOR_TESTS int
pypy_tscmp(const char *a, const char *b, long len_a, long len_b)
diff --git a/pypy/module/operator/tscmp.h b/pypy/module/operator/tscmp.h
new file mode 100644
--- /dev/null
+++ b/pypy/module/operator/tscmp.h
@@ -0,0 +1,2 @@
+int pypy_tscmp(const char *, const char *, long, long);
+int pypy_tscmp_wide(const wchar_t *, const wchar_t *, long, long);
diff --git a/pypy/module/operator/tscmp.py b/pypy/module/operator/tscmp.py
--- a/pypy/module/operator/tscmp.py
+++ b/pypy/module/operator/tscmp.py
@@ -12,7 +12,8 @@
cwd = py.path.local(__file__).dirpath()
eci = ExternalCompilationInfo(
- include_dirs=[cdir],
+ includes=[cwd.join('tscmp.h')],
+ include_dirs=[str(cwd), cdir],
separate_module_files=[cwd.join('tscmp.c')])
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
