[vlc-commits] contrib: upnp: Work around missing WIN32 macro

[Hugo Beauzée-Luyssen]

vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Apr 30 14:53:01 2015 +0200| [750b80b1f1875b106fb1bc0f09a29b7d520ffb87] | committer: Jean-Baptiste Kempf

contrib: upnp: Work around missing WIN32 macro

When building in non-gnu -std, WIN32 doesn't get defined.

(cherry picked from commit fcafb389009c6913d58ebeadf54a4fcc9624652d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/upnp/missing_win32.patch |   13 +++++++++++++
 contrib/src/upnp/rules.mak           |    1 +
 2 files changed, 14 insertions(+)

diff --git a/contrib/src/upnp/missing_win32.patch b/contrib/src/upnp/missing_win32.patch
new file mode 100644
index 0000000..c5f80d0
--- /dev/null
+++ b/contrib/src/upnp/missing_win32.patch
@@ -0,0 +1,13 @@
+--- upnp_clean/upnp/inc/upnp.h	2015-04-30 14:37:26.962425889 +0200
++++ upnp/upnp/inc/upnp.h	2015-04-30 14:41:48.099528162 +0200
+@@ -41,6 +41,10 @@
+  * \file
+  */
+ 
++#ifdef _WIN32
++# define WIN32
++#endif
++
+ #include "ixml.h"
+ #include "upnpconfig.h"
+ #include "UpnpGlobal.h"
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index f6706b1..14d05c0 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -25,6 +25,7 @@ ifdef HAVE_WIN32
 endif
 	$(APPLY) $(SRC)/upnp/libupnp-ipv6.patch
 	$(APPLY) $(SRC)/upnp/miniserver.patch
+	$(APPLY) $(SRC)/upnp/missing_win32.patch
 	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux/
 	$(MOVE)