Author: Matti Picus <[email protected]>
Branch:
Changeset: r71031:83ace05284a9
Date: 2014-04-27 23:00 +0300
http://bitbucket.org/pypy/pypy/changeset/83ace05284a9/
Log: fix test collection crash on msvc
diff --git a/pypy/module/cppyy/src/dummy_backend.cxx
b/pypy/module/cppyy/src/dummy_backend.cxx
--- a/pypy/module/cppyy/src/dummy_backend.cxx
+++ b/pypy/module/cppyy/src/dummy_backend.cxx
@@ -521,6 +521,15 @@
/* misc helpers ----------------------------------------------------------- */
+#if defined(_MSC_VER)
+long long cppyy_strtoll(const char* str) {
+ return _strtoi64(str, NULL, 0);
+}
+
+extern "C" unsigned long long cppyy_strtoull(const char* str) {
+ return _strtoui64(str, NULL, 0);
+}
+#else
long long cppyy_strtoll(const char* str) {
return strtoll(str, NULL, 0);
}
@@ -528,6 +537,7 @@
extern "C" unsigned long long cppyy_strtoull(const char* str) {
return strtoull(str, NULL, 0);
}
+#endif
void cppyy_free(void* ptr) {
free(ptr);
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
