Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r74260:620dfe2c1035
Date: 2014-10-27 15:14 -0700
http://bitbucket.org/pypy/pypy/changeset/620dfe2c1035/
Log: rename to avoid clashing w/ the system's locale.h
diff --git a/pypy/module/_codecs/locale.py b/pypy/module/_codecs/locale.py
--- a/pypy/module/_codecs/locale.py
+++ b/pypy/module/_codecs/locale.py
@@ -15,9 +15,9 @@
cwd = py.path.local(__file__).dirpath()
eci = ExternalCompilationInfo(
- includes=[cwd.join('locale.h')],
+ includes=[cwd.join('locale_codec.h')],
include_dirs=[str(cwd), cdir],
- separate_module_files=[cwd.join('locale.c')])
+ separate_module_files=[cwd.join('locale_codec.c')])
def llexternal(*args, **kwargs):
kwargs.setdefault('compilation_info', eci)
diff --git a/pypy/module/_codecs/locale.c b/pypy/module/_codecs/locale_codec.c
rename from pypy/module/_codecs/locale.c
rename to pypy/module/_codecs/locale_codec.c
--- a/pypy/module/_codecs/locale.c
+++ b/pypy/module/_codecs/locale_codec.c
@@ -28,6 +28,7 @@
#include <locale.h>
#include <langinfo.h>
#endif
+#include "locale_codec.h"
#if 0 && defined(__APPLE__)
extern wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size);
diff --git a/pypy/module/_codecs/locale.h b/pypy/module/_codecs/locale_codec.h
rename from pypy/module/_codecs/locale.h
rename to pypy/module/_codecs/locale_codec.h
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
