Commit 853a6c48 authored by Thomas Guillem's avatar Thomas Guillem Committed by Jean-Baptiste Kempf

Contrib: update upnp win32 patch

Mostly to remove "#include <iphlpapi.h>" which is unecessary, and can
break
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 1bd957da
--- libupnp/configure.ac.orig 2011-02-10 23:53:25.000000000 +0100
+++ libupnp/configure.ac 2011-02-10 23:54:23.574454501 +0100
@@ -546,6 +546,7 @@
AC_SUBST(PTHREAD_CFLAGS)
AC_SUBST(PTHREAD_CC)
diff -Naur libupnp/configure.ac libupnp.new/configure.ac
--- libupnp/configure.ac 2013-11-15 17:18:45.000000000 +0100
+++ libupnp.new/configure.ac 2014-12-15 19:36:30.625350753 +0100
@@ -557,6 +557,7 @@
echo "-------------------------------------------------------------------------------"
+AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows 2000 APIs.])
#
# Determine if pthread_rwlock_t is available
# Lot's of stuff to ensure large file support
#
diff -Naur libupnp/libupnp.pc.in libupnp.new/libupnp.pc.in
--- libupnp/libupnp.pc.in 2010-12-23 21:24:05.000000000 +0100
+++ libupnp.new/libupnp.pc.in 2011-02-13 11:27:23.000000000 +0100
+++ libupnp.new/libupnp.pc.in 2014-12-15 19:36:30.625350753 +0100
@@ -6,6 +6,6 @@
Name: libupnp
Description: Linux SDK for UPnP Devices
......@@ -18,20 +20,10 @@
+Libs: @PTHREAD_CFLAGS@ -L${libdir} -lupnp -lthreadutil -lixml -liphlpapi @PTHREAD_LIBS@
Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
--- libupnp/upnp/src/inc/upnputil.h 2010-12-23 21:24:06.000000000 +0100
+++ libupnp.new/upnp/src/inc/upnputil.h 2011-02-13 08:24:24.000000000 +0100
@@ -125,7 +125,7 @@
#define strncasecmp strnicmp
#define sleep(a) Sleep((a)*1000)
#define usleep(a) Sleep((a)/1000)
- #define strerror_r(a,b,c) (strerror_s((b),(c),(a)))
+ #define strerror_r(a,b,c) strncpy( b, strerror(a), c)
#else
#define max(a, b) (((a)>(b))? (a):(b))
#define min(a, b) (((a)<(b))? (a):(b))
--- upnp/upnp/inc/UpnpInet.h 2011-04-03 04:50:36.000000000 +0200
+++ upnp.neww/upnp/inc/UpnpInet.h 2011-11-18 01:54:45.418529337 +0100
@@ -15,11 +15,6 @@
diff -Naur libupnp/upnp/inc/UpnpInet.h libupnp.new/upnp/inc/UpnpInet.h
--- libupnp/upnp/inc/UpnpInet.h 2012-03-26 18:49:42.000000000 +0200
+++ libupnp.new/upnp/inc/UpnpInet.h 2014-12-15 19:36:48.353041056 +0100
@@ -15,13 +15,7 @@
#ifdef WIN32
#include <stdarg.h>
......@@ -41,5 +33,19 @@
- #include <windef.h>
- #endif
#include <winsock2.h>
#include <iphlpapi.h>
- #include <iphlpapi.h>
#include <ws2tcpip.h>
#define UpnpCloseSocket closesocket
diff -Naur libupnp/upnp/src/inc/upnputil.h libupnp.new/upnp/src/inc/upnputil.h
--- libupnp/upnp/src/inc/upnputil.h 2012-04-29 00:32:06.000000000 +0200
+++ libupnp.new/upnp/src/inc/upnputil.h 2014-12-15 19:36:30.625350753 +0100
@@ -130,7 +130,7 @@
#define strncasecmp strnicmp
#define sleep(a) Sleep((a)*1000)
#define usleep(a) Sleep((a)/1000)
- #define strerror_r(a,b,c) (strerror_s((b),(c),(a)))
+ #define strerror_r(a,b,c) strncpy( b, strerror(a), c)
#else
#define max(a, b) (((a)>(b))? (a):(b))
#define min(a, b) (((a)<(b))? (a):(b))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment