aboutsummaryrefslogtreecommitdiff
path: root/ports/librtmp/hide_netstackdump.patch
diff options
context:
space:
mode:
authorNikolay Baklicharov <thestorm.nik@gmail.com>2018-01-18 12:20:18 +0000
committerRobert Schumacher <roschuma@microsoft.com>2018-01-18 04:20:18 -0800
commit1b5ec0bc10b19563dc662c6480fd007cbc51c59f (patch)
tree37e96f1dc16a079ac491f9c01f036ccda6fea52b /ports/librtmp/hide_netstackdump.patch
parentc1ba4eacc34a814ce2f9f0b35bf055750c94f8c2 (diff)
downloadvcpkg-1b5ec0bc10b19563dc662c6480fd007cbc51c59f.tar.gz
vcpkg-1b5ec0bc10b19563dc662c6480fd007cbc51c59f.zip
librtmp: Fix debug build (#2537)
Diffstat (limited to 'ports/librtmp/hide_netstackdump.patch')
-rw-r--r--ports/librtmp/hide_netstackdump.patch38
1 files changed, 37 insertions, 1 deletions
diff --git a/ports/librtmp/hide_netstackdump.patch b/ports/librtmp/hide_netstackdump.patch
index 391bbdc39..2ae44e46b 100644
--- a/ports/librtmp/hide_netstackdump.patch
+++ b/ports/librtmp/hide_netstackdump.patch
@@ -1,7 +1,25 @@
diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
-index 5ef3ae9..e559c6e 100644
+index 5ef3ae9..7c6a010 100644
--- a/librtmp/rtmp.c
+++ b/librtmp/rtmp.c
+@@ -129,7 +129,7 @@ static int clk_tck;
+ uint32_t
+ RTMP_GetTime()
+ {
+-#ifdef _DEBUG
++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY)
+ return 0;
+ #elif defined(_WIN32)
+ return timeGetTime();
+@@ -1256,7 +1256,7 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet)
+ return bHasMediaPacket;
+ }
+
+-#ifdef _DEBUG
++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY)
+ extern FILE *netstackdump;
+ extern FILE *netstackdump_read;
+ #endif
@@ -1333,7 +1333,7 @@ ReadN(RTMP *r, char *buffer, int n)
SendBytesReceived(r);
}
@@ -11,6 +29,24 @@ index 5ef3ae9..e559c6e 100644
fwrite(ptr, 1, nBytes, netstackdump_read);
#endif
+@@ -3064,7 +3064,7 @@ HandShake(RTMP *r, int FP9HandShake)
+
+ memset(&clientsig[4], 0, 4);
+
+-#ifdef _DEBUG
++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY)
+ for (i = 8; i < RTMP_SIG_SIZE; i++)
+ clientsig[i] = 0xff;
+ #else
+@@ -3136,7 +3136,7 @@ SHandShake(RTMP *r)
+ memcpy(serversig, &uptime, 4);
+
+ memset(&serversig[4], 0, 4);
+-#ifdef _DEBUG
++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY)
+ for (i = 8; i < RTMP_SIG_SIZE; i++)
+ serversig[i] = 0xff;
+ #else
@@ -3553,7 +3553,7 @@ RTMPSockBuf_Send(RTMPSockBuf *sb, const char *buf, int len)
{
int rc;