Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r74242:f70579d34dff
Date: 2014-10-26 04:45 -0700
http://bitbucket.org/pypy/pypy/changeset/f70579d34dff/
Log: merge default
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
@@ -4,8 +4,9 @@
#include <stdlib.h>
#include <wchar.h>
#include "src/precommondefs.h"
+#include "tscmp.h"
-RPY_EXPORTED_FOR_TESTS int
+int
pypy_tscmp(const char *a, const char *b, long len_a, long len_b)
{
/* The volatile type declarations make sure that the compiler has no
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,1 @@
+RPY_EXPORTED_FOR_TESTS int pypy_tscmp(const char *, const char *, 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
@@ -13,7 +13,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
