From accfa06ede3231fe74e3e49858eb0d44ff0431e6 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 1 Dec 2008 23:38:22 +0000 Subject: [PATCH] * 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. --- source/blender/python/intern/bpy_compat.h | 6 ++---- 1 file 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 -- 2.23.0