Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2008-12-02 02:38:22 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2008-12-02 02:38:22 +0300
commitaccfa06ede3231fe74e3e49858eb0d44ff0431e6 (patch)
tree81e16348f2801e41e1bb6fe144dfd02421cfff62 /source/blender/python
parentd1e75c215b79250fb4262a0e18d8912b11589b0f (diff)
* 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.
Diffstat (limited to 'source/blender/python')
-rw-r--r--source/blender/python/intern/bpy_compat.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/python/intern/bpy_compat.h b/source/blender/python/intern/bpy_compat.h
index cadea4b1e61..348947b7fcb 100644
--- a/source/blender/python/intern/bpy_compat.h
+++ b/source/blender/python/intern/bpy_compat.h
@@ -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