From 03841dcb817bc54c060ae2af3a61ddeb140a918f Mon Sep 17 00:00:00 2001 From: Brenton Bostick Date: Thu, 20 Jul 2023 10:38:08 -0500 Subject: [PATCH] fix warning: 'OS_STRING' macro redefined [-Wmacro-redefined] (#2064) Even though this is in ext, these particular chunks of code were added by us, so are ok to modify. --- ext/miniupnpc/minisoap.c | 2 ++ ext/miniupnpc/miniwget.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ext/miniupnpc/minisoap.c b/ext/miniupnpc/minisoap.c index 5b8c0784c..11f4635ad 100644 --- a/ext/miniupnpc/minisoap.c +++ b/ext/miniupnpc/minisoap.c @@ -21,12 +21,14 @@ #include "minisoap.h" #ifdef _WIN32 +#undef OS_STRING #define OS_STRING "Win32" #define MINIUPNPC_VERSION_STRING "2.0" #define UPNP_VERSION_STRING "UPnP/1.1" #endif #ifdef __ANDROID__ +#undef OS_STRING #define OS_STRING "Android" #define MINIUPNPC_VERSION_STRING "2.0" #define UPNP_VERSION_STRING "UPnP/1.1" diff --git a/ext/miniupnpc/miniwget.c b/ext/miniupnpc/miniwget.c index e23f11e37..0c461734f 100644 --- a/ext/miniupnpc/miniwget.c +++ b/ext/miniupnpc/miniwget.c @@ -49,12 +49,14 @@ #endif /* MIN */ #ifdef _WIN32 +#undef OS_STRING #define OS_STRING "Win32" #define MINIUPNPC_VERSION_STRING "2.0" #define UPNP_VERSION_STRING "UPnP/1.1" #endif #ifdef __ANDROID__ +#undef OS_STRING #define OS_STRING "Android" #define MINIUPNPC_VERSION_STRING "2.0" #define UPNP_VERSION_STRING "UPnP/1.1"