Commit b60ad706 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: update UPNP to 1.6.16

Important code changes were done by Orange
(cherry picked from commit be96451c7799f1b2831e5d05dea4e5d0bf94643b)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 81823ae8
d376adc53cf20901dcaa254813c1655f8125ee5e965e6fe3c52d45d48cb06b8a21e016a12ad7b60be0d6c8bcbc7eed0dba473389d313d140ddd073e4e77f301d libupnp-1.6.15.tar.bz2 92a001a3b582fab957ea84e3b1d34a9308a69fbf61094e93f78523644552fb91177b0d2fb624da647d6e55a1db81642ef35b79e0eaaa04025566919343287649 libupnp-1.6.16.tar.bz2
--- libupnp/upnp/inc/upnp.h 2011-03-15 22:59:38.000000000 +0100
+++ libupnp.new/upnp/inc/upnp.h 2011-09-23 01:39:55.000000000 +0200
@@ -57,6 +57,19 @@
/* Other systems ??? */
#endif
+# if defined( __MINGW32__ )
+# if !defined( _OFF_T_ )
+ typedef long long _off_t;
+ typedef _off_t off_t;
+# define _OFF_T_
+# else
+# ifdef off_t
+# undef off_t
+# endif
+# define off_t long long
+# endif
+# endif
+
#define LINE_SIZE 180
#define NAME_SIZE 256
#define MNFT_NAME_SIZE 64
--- libupnp/threadutil/inc/ThreadPool.h 2011-01-20 07:46:57.000000000 +0100 --- libupnp/threadutil/inc/ThreadPool.h 2011-01-20 07:46:57.000000000 +0100
+++ libupnp.new/threadutil/inc/ThreadPool.h 2011-09-23 01:36:12.000000000 +0200 +++ libupnp.new/threadutil/inc/ThreadPool.h 2011-09-23 01:36:12.000000000 +0200
@@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@
...@@ -38,3 +16,26 @@ ...@@ -38,3 +16,26 @@
#else /* WIN32 */ #else /* WIN32 */
#include <sys/param.h> #include <sys/param.h>
#include <sys/time.h> /* for gettimeofday() */ #include <sys/time.h> /* for gettimeofday() */
--- libupnp-1.6.16/upnp/inc/upnp.h.orig 2012-03-22 00:15:38.000000000 +0100
+++ libupnp-1.6.16/upnp/inc/upnp.h 2012-03-28 18:58:55.043642000 +0200
@@ -61,6 +61,20 @@
/* Other systems ??? */
#endif
+# if defined( __MINGW32__ )
+# if !defined( _OFF_T_ )
+ typedef long long _off_t;
+ typedef _off_t off_t;
+# define _OFF_T_
+# else
+# ifdef off_t
+# undef off_t
+# endif
+# define off_t long long
+# endif
+# endif
+
+
#define LINE_SIZE (size_t)180
#define NAME_SIZE (size_t)256
#define MNFT_NAME_SIZE 64
# UPNP # UPNP
UPNP_VERSION := 1.6.15 UPNP_VERSION := 1.6.16
UPNP_URL := $(SF)/pupnp/libupnp-$(UPNP_VERSION).tar.bz2 UPNP_URL := $(SF)/pupnp/libupnp-$(UPNP_VERSION).tar.bz2
PKGS += upnp PKGS += upnp
......
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