[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17673] branches/blender2.5/blender/source /blender/python/intern/bpy_compat.h: * after discussion with cambo on IRC, change the #ifndef's to #undefs instead:

Nathan Letwory jesterking at letwory.net
Tue Dec 2 00:38:26 CET 2008


Revision: 17673
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17673
Author:   jesterking
Date:     2008-12-02 00:38:22 +0100 (Tue, 02 Dec 2008)

Log Message:
-----------
* after discussion with cambo on IRC, change the #ifndef's to #undefs instead:
  Pre-Python 3.0 has strings default non-unicode, so checks and handling should be done so too.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h

Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h	2008-12-01 22:20:18 UTC (rev 17672)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h	2008-12-01 23:38:22 UTC (rev 17673)
@@ -34,16 +34,14 @@
 #if PY_VERSION_HEX < 0x03000000
 #define _PyUnicode_AsString PyString_AsString
 
-#ifndef PyUnicode_Check
+#undef PyUnicode_Check
 #define PyUnicode_Check PyString_Check
-#endif
 
 #define PyLong_FromSize_t PyInt_FromLong
 #define PyLong_AsSsize_t PyInt_AsLong
 
-#ifndef PyLong_Check
+#undef PyLong_Check
 #define PyLong_Check PyInt_Check
-#endif
 
 #define PyUnicode_FromString PyString_FromString
 #define PyUnicode_FromFormat PyString_FromFormat





More information about the Bf-blender-cvs mailing list