[vlc-commits] Revert "Contrib: update upnp win32 patch"

[Rafaël Carré]

vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Thu Jan 22 18:49:03 2015 +0100| [bb5afb097b1a39a196d93a64cd0ad2f3c4bbfba3] | committer: Rafaël Carré

Revert "Contrib: update upnp win32 patch"

This reverts commit 853a6c489c353ecd994bc73912139281d30ee0d4.

Breaks compilation with mingw-w64 3.2 :

libtool: compile:  x86_64-w64-mingw32-gcc -DHAVE_CONFIG_H -I. -I..
-I../upnp/inc -I./inc -I../threadutil/inc -I../ixml/inc -I./src/inc
-I/contrib/x86_64-w64-mingw32/include -DPTW32_STATIC_LIB
-DUPNP_STATIC_LIB -I/contrib/x86_64-w64-mingw32/include
-g -DUPNP_STATIC_LIB -DPTW32_STATIC_LIB -Os -Wall -c src/api/upnpapi.c
-o src/api/libupnp_la-upnpapi.o
src/api/upnpapi.c: In function 'UpnpGetIfInfo':
src/api/upnpapi.c:3214:2: error: unknown type name 'PIP_ADAPTER_ADDRESSES'
  PIP_ADAPTER_ADDRESSES adapts = NULL;
  ^

(cherry picked from commit 4801fc4fe27c308ec8d9dc4a3776481c4d8ed240)
Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=bb5afb097b1a39a196d93a64cd0ad2f3c4bbfba3
---

 contrib/src/upnp/libupnp-win32.patch |   50 +++++++++++++++-------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/contrib/src/upnp/libupnp-win32.patch b/contrib/src/upnp/libupnp-win32.patch
index 375e320..686e3ba 100644
--- a/contrib/src/upnp/libupnp-win32.patch
+++ b/contrib/src/upnp/libupnp-win32.patch
@@ -1,17 +1,15 @@
-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 "-------------------------------------------------------------------------------"
- 
+--- 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)
  
 +AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows 2000 APIs.])
  #
- # Lot's of stuff to ensure large file support
+ # Determine if pthread_rwlock_t is available
  #
-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	2014-12-15 19:36:30.625350753 +0100
++++ libupnp.new/libupnp.pc.in	2011-02-13 11:27:23.000000000 +0100
 @@ -6,6 +6,6 @@
  Name: libupnp
  Description: Linux SDK for UPnP Devices
@@ -20,10 +18,20 @@ diff -Naur libupnp/libupnp.pc.in libupnp.new/libupnp.pc.in
 +Libs: @PTHREAD_CFLAGS@ -L${libdir} -lupnp -lthreadutil -lixml -liphlpapi @PTHREAD_LIBS@ 
  Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
  
-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 @@
+--- 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 @@
  
  #ifdef WIN32
  	#include <stdarg.h>
@@ -33,19 +41,5 @@ diff -Naur libupnp/upnp/inc/UpnpInet.h libupnp.new/upnp/inc/UpnpInet.h
 -		#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))