Skip to content

Commit 21dbc27

Browse files
committed
Fix build warning for use of strdup in ultrajson
When building with `-std=c99` on Linux this gives a warning: ``` [2/3] Compiling C object pandas/_libs/json.cpython-310-x86_64-linux-gnu.so.p/src_ujson_lib_ultrajsonenc.c.o ../pandas/_libs/src/ujson/lib/ultrajsonenc.c: In function 'JSON_EncodeObject': ../pandas/_libs/src/ujson/lib/ultrajsonenc.c:1180:18: warning: implicit declaration of function 'strdup'; did you mean 'strcmp'? [-Wimplicit-function-declaration] 1180 | locale = strdup(locale); | ^~~~~~ | strcmp ../pandas/_libs/src/ujson/lib/ultrajsonenc.c:1180:16: warning: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 1180 | locale = strdup(locale); ``` And for the MSVC build in CI the warnings look like: ``` building 'pandas._libs.json' extension creating build\temp.win-amd64-cpython-310\Release\pandas\_libs\src\ujson creating build\temp.win-amd64-cpython-310\Release\pandas\_libs\src\ujson\lib creating build\temp.win-amd64-cpython-310\Release\pandas\_libs\src\ujson\python "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.33.31629\bin\HostX86\x64\cl.exe" /c /nologo /O2 /W3 /GL /DNDEBUG /MD -DNPY_NO_DEPRECATED_API=0 -Ipandas/_libs/src/ujson/python -Ipandas/_libs/src/ujson/lib -Ipandas/_libs/src/datetime -IC:\Users\runneradmin\micromamba\envs\test\lib\site-packages\numpy\core\include -IC:\Users\runneradmin\micromamba\envs\test\include -IC:\Users\runneradmin\micromamba\envs\test\Include "-IC:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.33.31629\include" "-IC:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.33.31629\ATLMFC\include" "-IC:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\VS\include" "-IC:\Program Files (x86)\Windows Kits\10\include\10.0.22621.0\ucrt" "-IC:\Program Files (x86)\Windows Kits\10\\include\10.0.22621.0\\um" "-IC:\Program Files (x86)\Windows Kits\10\\include\10.0.22621.0\\shared" "-IC:\Program Files (x86)\Windows Kits\10\\include\10.0.22621.0\\winrt" "-IC:\Program Files (x86)\Windows Kits\10\\include\10.0.22621.0\\cppwinrt" "-IC:\Program Files (x86)\Windows Kits\NETFXSDK\4.8\include\um" /Tcpandas/_libs/src/ujson/lib/ultrajsondec.c /Fobuild\temp.win-amd64-cpython-310\Release\pandas/_libs/src/ujson/lib/ultrajsondec.obj -D_GNU_SOURCE ultrajsondec.c pandas/_libs/src/ujson/lib/ultrajsondec.c(1178): warning C4996: 'strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. See online help for details. ``` I considered avoiding the code duplication by putting this block in a shared file, but the two files touched here already have quite a bit of duplicated code, so that's best left alone.
1 parent 298dac3 commit 21dbc27

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

pandas/_libs/src/ujson/lib/ultrajsondec.c

+9
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@ Numeric decoder derived from TCL library
5656
#define NULL 0
5757
#endif
5858

59+
/* `strdup` is POSIX not C99, and MSVC calls it `_strdup` */
60+
#ifndef strdup
61+
#ifdef _MSC_VER
62+
#define strdup _strdup
63+
#else
64+
extern char* strdup(const char*);
65+
#endif
66+
#endif
67+
5968
struct DecoderState {
6069
char *start;
6170
char *end;

pandas/_libs/src/ujson/lib/ultrajsonenc.c

+9
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ Numeric decoder derived from TCL library
5454
#define FALSE 0
5555
#endif
5656

57+
/* `strdup` is POSIX not C99, and MSVC calls it `_strdup` */
58+
#ifndef strdup
59+
#ifdef _MSC_VER
60+
#define strdup _strdup
61+
#else
62+
extern char* strdup(const char*);
63+
#endif
64+
#endif
65+
5766
/*
5867
Worst cases being:
5968

0 commit comments

Comments
 (0)