# HG changeset patch # User Fredrik Lundh # Date 1257420064 -3600 # Node ID 8654fb7d01186230d518d61af3dc7b819ffcf685 # Parent 95a726e486ba7ba202a0f14cf12070640fe0e5a8 Avoid quotes in macro definitions passed in from setup.py; this doesn't work on all platforms. diff -r 95a726e486ba7ba202a0f14cf12070640fe0e5a8 -r 8654fb7d01186230d518d61af3dc7b819ffcf685 cjson.c --- a/cjson.c Thu Nov 05 11:18:54 2009 +0100 +++ b/cjson.c Thu Nov 05 12:21:04 2009 +0100 @@ -74,6 +74,9 @@ #define skipSpaces(d) while(*((d)->ptr) && isspace(*((d)->ptr))) (d)->ptr++ +/* macro hackery to stringify a defined value */ +#define STR(x) #x +#define STRINGIFY(x) STR(x) /* ------------------------------ Decoding ----------------------------- */ @@ -1163,7 +1166,7 @@ PyModule_AddObject(m, "DecodeError", JSON_DecodeError); // Module version (the MODULE_VERSION macro is defined by setup.py) - PyModule_AddStringConstant(m, "__version__", MODULE_VERSION); + PyModule_AddStringConstant(m, "__version__", STRINGIFY(MODULE_VERSION)); } diff -r 95a726e486ba7ba202a0f14cf12070640fe0e5a8 -r 8654fb7d01186230d518d61af3dc7b819ffcf685 setup.py --- a/setup.py Thu Nov 05 11:18:54 2009 +0100 +++ b/setup.py Thu Nov 05 12:21:04 2009 +0100 @@ -4,7 +4,7 @@ __version__ = "1.0.5" -macros = [('MODULE_VERSION', '"%s"' % __version__)] +macros = [('MODULE_VERSION', '%s' % __version__)] setup(name = "python-cjson", version = __version__,