ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-01 15:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix warning: 'OS_STRING' macro redefined [-Wmacro-redefined] (#2064)

Browse Source 
Even though this is in ext, these particular chunks of code were added
by us, so are ok to modify.
This commit is contained in:
Brenton Bostick 2023-07-20 10:38:08 -05:00 committed by GitHub
parent 64c2634b71
commit 03841dcb81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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