diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2018-01-17 19:00:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2018-01-17 19:00:43 +1100 |
| commit | c30363d07b3f64b5f38531442ea92d9c1cf81d13 (patch) | |
| tree | 8a169a2a0aadf40dad50e73d226c3eca1e949327 /ports/librtmp/fix_strncasecmp.patch | |
| parent | 47189e90d59459be69d4f6a0b039849913031c8e (diff) | |
| parent | 28c5c6ae4601c323cbd57a13da03b9047dc282ad (diff) | |
| download | vcpkg-c30363d07b3f64b5f38531442ea92d9c1cf81d13.tar.gz vcpkg-c30363d07b3f64b5f38531442ea92d9c1cf81d13.zip | |
Merge branch 'master' into qt5_modular
Diffstat (limited to 'ports/librtmp/fix_strncasecmp.patch')
| -rw-r--r-- | ports/librtmp/fix_strncasecmp.patch | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/ports/librtmp/fix_strncasecmp.patch b/ports/librtmp/fix_strncasecmp.patch index c1cadc4ac..3e0c7ea96 100644 --- a/ports/librtmp/fix_strncasecmp.patch +++ b/ports/librtmp/fix_strncasecmp.patch @@ -1,16 +1,20 @@ diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h -index 0874cbe..b43d587 100644 +index 6a3f215..1b5ac2a 100644 --- a/librtmp/rtmp_sys.h +++ b/librtmp/rtmp_sys.h -@@ -37,6 +37,11 @@ +@@ -28,11 +28,13 @@ #include <ws2tcpip.h> - #endif -+#ifdef _MSC_VER -+#define strncasecmp _strnicmp + #ifdef _MSC_VER /* MSVC */ ++#if _MSC_VER < 1900 + #define snprintf _snprintf +-#define strcasecmp stricmp +-#define strncasecmp strnicmp + #define vsnprintf _vsnprintf + #endif +#define strcasecmp _stricmp ++#define strncasecmp _strnicmp +#endif -+ + #define GetSockError() WSAGetLastError() #define SetSockError(e) WSASetLastError(e) - #define setsockopt(a,b,c,d,e) (setsockopt)(a,b,c,(const char *)d,(int)e) |