git.sesse.net Git - vlc/blob - contrib/src/upnp/libupnp-win32.patch

   1 --- libupnp/configure.ac.orig   2011-02-10 23:53:25.000000000 +0100
   2 +++ libupnp/configure.ac        2011-02-10 23:54:23.574454501 +0100
   3 @@ -546,6 +546,7 @@
   4  AC_SUBST(PTHREAD_CFLAGS)
   5  AC_SUBST(PTHREAD_CC)
   6
   7 +AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows 2000 APIs.])
   8  #
   9  # Determine if pthread_rwlock_t is available
  10  #
  11 --- libupnp/libupnp.pc.in       2010-12-23 21:24:05.000000000 +0100
  12 +++ libupnp.new/libupnp.pc.in   2011-02-13 11:27:23.000000000 +0100
  13 @@ -6,6 +6,6 @@
  14  Name: libupnp
  15  Description: Linux SDK for UPnP Devices
  16  Version: @VERSION@
  17 -Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml
  18 +Libs: @PTHREAD_CFLAGS@ -L${libdir} -lupnp -lthreadutil -lixml -liphlpapi @PTHREAD_LIBS@
  19  Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
  20
  21 --- libupnp/upnp/src/inc/upnputil.h     2010-12-23 21:24:06.000000000 +0100
  22 +++ libupnp.new/upnp/src/inc/upnputil.h 2011-02-13 08:24:24.000000000 +0100
  23 @@ -125,7 +125,7 @@
  24                 #define strncasecmp             strnicmp
  25                 #define sleep(a)                Sleep((a)*1000)
  26                 #define usleep(a)               Sleep((a)/1000)
  27 -               #define strerror_r(a,b,c)       (strerror_s((b),(c),(a)))
  28 +               #define strerror_r(a,b,c)       strncpy( b, strerror(a), c)
  29         #else
  30                 #define max(a, b)   (((a)>(b))? (a):(b))
  31                 #define min(a, b)   (((a)<(b))? (a):(b))
  32 --- upnp/upnp/inc/UpnpInet.h    2011-04-03 04:50:36.000000000 +0200
  33 +++ upnp.neww/upnp/inc/UpnpInet.h       2011-11-18 01:54:45.418529337 +0100
  34 @@ -15,11 +15,6 @@
  35
  36  #ifdef WIN32
  37         #include <stdarg.h>
  38 -       #ifndef UPNP_USE_MSVCPP
  39 -               /* Removed: not required (and cause compilation issues) */
  40 -               #include <winbase.h>
  41 -               #include <windef.h>
  42 -       #endif
  43         #include <winsock2.h>
  44         #include <iphlpapi.h>
  45         #include <ws2tcpip.h>