From 5f4dbd3242ecf999828af89405ba86d3773985b1 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:35:03 +0200 Subject: [PATCH 1/3] BLD: Fix armv7 build --- pandas/_libs/src/vendored/ujson/python/JSONtoObj.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c b/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c index 7cc20a52f1849..6a7cf15cdc01a 100644 --- a/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c +++ b/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c @@ -40,7 +40,10 @@ Numeric decoder derived from TCL library #include "pandas/vendored/ujson/lib/ultrajson.h" #define PY_SSIZE_T_CLEAN +// clang-format off #include +#include "pandas/vendored/ujson/lib/ultrajson.h" +// clang-format on static int Object_objectAddKey(void *Py_UNUSED(prv), JSOBJ obj, JSOBJ name, JSOBJ value) { From 1a6dd0114ebe107c2a150a1d194d7cf67b327150 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Fri, 27 Sep 2024 09:35:19 +0200 Subject: [PATCH 2/3] Remove redundant include --- pandas/_libs/src/vendored/ujson/python/JSONtoObj.c | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c b/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c index 6a7cf15cdc01a..3f01d469a9820 100644 --- a/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c +++ b/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c @@ -38,7 +38,6 @@ Numeric decoder derived from TCL library // Licence at LICENSES/ULTRAJSON_LICENSE -#include "pandas/vendored/ujson/lib/ultrajson.h" #define PY_SSIZE_T_CLEAN // clang-format off #include From af66b1d795d1698e1dd44187ab4f7579c5007007 Mon Sep 17 00:00:00 2001 From: William Ayd Date: Mon, 30 Sep 2024 14:14:04 -0400 Subject: [PATCH 3/3] Update JSONtoObj.c --- pandas/_libs/src/vendored/ujson/python/JSONtoObj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c b/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c index 3f01d469a9820..4cfead8ac77a5 100644 --- a/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c +++ b/pandas/_libs/src/vendored/ujson/python/JSONtoObj.c @@ -38,8 +38,8 @@ Numeric decoder derived from TCL library // Licence at LICENSES/ULTRAJSON_LICENSE -#define PY_SSIZE_T_CLEAN // clang-format off +#define PY_SSIZE_T_CLEAN #include #include "pandas/vendored/ujson/lib/ultrajson.h" // clang-format on