瀏覽代碼

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.
Brenton Bostick 2 年之前
父節點
當前提交
03841dcb81
共有 2 個文件被更改,包括 4 次插入0 次删除
  1. 2 0
      ext/miniupnpc/minisoap.c
  2. 2 0
      ext/miniupnpc/miniwget.c

+ 2 - 0
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"

+ 2 - 0
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"