Home Explore Help
Sign In
cpp
/
ZeroTierOne
mirror of https://github.com/zerotier/ZeroTierOne
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

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 years ago
parent
64c2634b71
commit
03841dcb81
2 changed files with 4 additions and 0 deletions
Unified View Show Diff Stats
  1. 2 0
      ext/miniupnpc/minisoap.c
  2. 2 0
      ext/miniupnpc/miniwget.c

+ 2 - 0
ext/miniupnpc/minisoap.c
View File 

@@ -21,12 +21,14 @@
 
 #include "minisoap.h"
 
 #include "minisoap.h"
 
 
 
 #ifdef _WIN32
 
 #ifdef _WIN32
 
+#undef OS_STRING
 
 #define OS_STRING "Win32"
 
 #define OS_STRING "Win32"
 
 #define MINIUPNPC_VERSION_STRING "2.0"
 
 #define MINIUPNPC_VERSION_STRING "2.0"
 
 #define UPNP_VERSION_STRING "UPnP/1.1"
 
 #define UPNP_VERSION_STRING "UPnP/1.1"
 
 #endif
 
 #endif
 
 
 
 #ifdef __ANDROID__
 
 #ifdef __ANDROID__
 
+#undef OS_STRING
 
 #define OS_STRING "Android"
 
 #define OS_STRING "Android"
 
 #define MINIUPNPC_VERSION_STRING "2.0"
 
 #define MINIUPNPC_VERSION_STRING "2.0"
 
 #define UPNP_VERSION_STRING "UPnP/1.1"
 
 #define UPNP_VERSION_STRING "UPnP/1.1"

+ 2 - 0
ext/miniupnpc/miniwget.c
View File 

@@ -49,12 +49,14 @@
 
 #endif /* MIN */
 
 #endif /* MIN */
 
 
 
 #ifdef _WIN32
 
 #ifdef _WIN32
 
+#undef OS_STRING
 
 #define OS_STRING "Win32"
 
 #define OS_STRING "Win32"
 
 #define MINIUPNPC_VERSION_STRING "2.0"
 
 #define MINIUPNPC_VERSION_STRING "2.0"
 
 #define UPNP_VERSION_STRING "UPnP/1.1"
 
 #define UPNP_VERSION_STRING "UPnP/1.1"
 
 #endif
 
 #endif
 
 
 
 #ifdef __ANDROID__
 
 #ifdef __ANDROID__
 
+#undef OS_STRING
 
 #define OS_STRING "Android"
 
 #define OS_STRING "Android"
 
 #define MINIUPNPC_VERSION_STRING "2.0"
 
 #define MINIUPNPC_VERSION_STRING "2.0"
 
 #define UPNP_VERSION_STRING "UPnP/1.1"
 
 #define UPNP_VERSION_STRING "UPnP/1.1"