[vlc-devel] [vlc-commits] Contrib: update upnp win32 patch

[Rafaël Carré]

Hi,

On 12/17/2014 05:52 PM, Thomas Guillem wrote:
> vlc/vlc-2.2 | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Dec 15 19:46:34 2014 +0100| [153de15cbc67af3b1f523e128cedcfb0c1e85b52] | committer: 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 <jb at videolan.org>
> (cherry picked from commit 853a6c489c353ecd994bc73912139281d30ee0d4)
> Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> 
>> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=153de15cbc67af3b1f523e128cedcfb0c1e85b52

That commit breaks the build:

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/home/funman/vlc/contrib/x86_64-w64-mingw32/include -DPTW32_STATIC_LIB
-DUPNP_STATIC_LIB -I/home/funman/vlc/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;
  ^

Reverting fixes the problem.

Thomas, OK to revert ?