Author: mattip
Branch: win64-stage1
Changeset: r53821:ede02812ff74
Date: 2012-03-20 00:07 +0200
http://bitbucket.org/pypy/pypy/changeset/ede02812ff74/
Log: explicitly state problem when compiler and underlying python
disagree
diff --git a/pypy/rpython/tool/rffi_platform.py
b/pypy/rpython/tool/rffi_platform.py
--- a/pypy/rpython/tool/rffi_platform.py
+++ b/pypy/rpython/tool/rffi_platform.py
@@ -660,8 +660,8 @@
if isinstance(fieldtype, lltype.FixedSizeArray):
size, _ = expected_size_and_sign
return lltype.FixedSizeArray(fieldtype.OF, size/_sizeof(fieldtype.OF))
- raise TypeError("conflicting field type %r for %r" % (fieldtype,
- fieldname))
+ raise TypeError("conflict between translating python and compiler field"
+ " type %r for %r" % (fieldtype, fieldname))
def expose_value_as_rpython(value):
if intmask(value) == value:
diff --git a/pypy/translator/tool/cbuild.py b/pypy/translator/tool/cbuild.py
--- a/pypy/translator/tool/cbuild.py
+++ b/pypy/translator/tool/cbuild.py
@@ -323,12 +323,10 @@
#ifdef _WIN64
typedef long long Signed;
typedef unsigned long long Unsigned;
-#warning 64 bit build
# define SIGNED_MIN LLONG_MIN
#else
typedef long Signed;
typedef unsigned long Unsigned;
-#warning 32 bit build
# define SIGNED_MIN LONG_MIN
#endif
'''
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
