aboutsummaryrefslogtreecommitdiff
path: root/ports/librtmp/fix_strncasecmp.patch
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2018-01-08 14:13:47 -0800
committerGitHub <noreply@github.com>2018-01-08 14:13:47 -0800
commit65d56f25bb97dcab13430fc206e81fcda5f43978 (patch)
tree11898b0021d70bafd1ebbcd8c12ffbe97e414333 /ports/librtmp/fix_strncasecmp.patch
parentea5326cf80ba8bd528538f7452db9bd1a1f87176 (diff)
parent78ae618d8ec3bad4e9dc45f3a382a513ffd09065 (diff)
downloadvcpkg-65d56f25bb97dcab13430fc206e81fcda5f43978.tar.gz
vcpkg-65d56f25bb97dcab13430fc206e81fcda5f43978.zip
Merge pull request #2532 from TheStormN/librtmp-to-v2.4
[librtmp] Update to 2.4
Diffstat (limited to 'ports/librtmp/fix_strncasecmp.patch')
-rw-r--r--ports/librtmp/fix_strncasecmp.patch18
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)