From 188399fa3d1b4547f79cf4f9a0532b0c0d14e85e Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Wed, 12 Jun 2013 20:07:16 -0400 Subject: [PATCH] FIX: change initObjToJSON return type This is necessary because clang complains about the return type. There's a call to the macro import_array() which injects a return statement into wherever it's used. --- pandas/src/ujson/python/objToJSON.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandas/src/ujson/python/objToJSON.c b/pandas/src/ujson/python/objToJSON.c index ce8bdf3721f5e..534d60970dd81 100644 --- a/pandas/src/ujson/python/objToJSON.c +++ b/pandas/src/ujson/python/objToJSON.c @@ -100,7 +100,11 @@ enum PANDAS_FORMAT //#define PRINTMARK() fprintf(stderr, "%s: MARK(%d)\n", __FILE__, __LINE__) #define PRINTMARK() +#if (PY_VERSION_HEX >= 0x03000000) void initObjToJSON(void) +#else +int initObjToJSON(void) +#endif { PyObject *mod_frame; PyDateTime_IMPORT;