Skip to content

Commit aed9996

Browse files
committed
Merge pull request #3874 from cpcloud/c-ujson-fix
FIX: change initObjToJSON return type
2 parents b9ff59c + 188399f commit aed9996

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

pandas/src/ujson/python/objToJSON.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,11 @@ enum PANDAS_FORMAT
100100
//#define PRINTMARK() fprintf(stderr, "%s: MARK(%d)\n", __FILE__, __LINE__)
101101
#define PRINTMARK()
102102

103+
#if (PY_VERSION_HEX >= 0x03000000)
103104
void initObjToJSON(void)
105+
#else
106+
int initObjToJSON(void)
107+
#endif
104108
{
105109
PyObject *mod_frame;
106110
PyDateTime_IMPORT;

0 commit comments

Comments
 (0)