Commit ecac4600 authored by gbazin's avatar gbazin
Browse files

* include/network.h, modules/access/mms/mmstu.c, src/stream_output/acl.c: WinCE build fixes.

parent 23d037b0
...@@ -26,16 +26,25 @@ ...@@ -26,16 +26,25 @@
#ifndef __VLC_NETWORK_H #ifndef __VLC_NETWORK_H
# define __VLC_NETWORK_H # define __VLC_NETWORK_H
#if defined( UNDER_CE ) #if defined( WIN32 )
# include <winsock.h> # if defined(UNDER_CE) && defined(sockaddr_storage)
#elif defined( WIN32 ) # undef sockaddr_storage
# endif
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h> # include <ws2tcpip.h>
#else #else
# if HAVE_SYS_SOCKET_H
# include <sys/socket.h>
# endif
# if HAVE_NETINET_IN_H
# include <netinet/in.h>
# endif
# if HAVE_ARPA_INET_H
# include <arpa/inet.h>
# elif defined( SYS_BEOS )
# include <net/netdb.h>
# endif
# include <netdb.h> # include <netdb.h>
#if HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
#endif #endif
......
...@@ -47,24 +47,6 @@ ...@@ -47,24 +47,6 @@
# include <sys/stat.h> # include <sys/stat.h>
#endif #endif
#if defined( UNDER_CE )
# include <winsock.h>
#elif WIN32
# include <winsock2.h>
# include <ws2tcpip.h>
# ifndef IN_MULTICAST
# define IN_MULTICAST(a) IN_CLASSD(a)
# endif
#else
# include <sys/socket.h>
# include <netinet/in.h>
# if HAVE_ARPA_INET_H
# include <arpa/inet.h>
# elif defined( SYS_BEOS )
# include <net/netdb.h>
# endif
#endif
#include "network.h" #include "network.h"
#include "asf.h" #include "asf.h"
#include "buffer.h" #include "buffer.h"
......
...@@ -35,15 +35,6 @@ ...@@ -35,15 +35,6 @@
#include <errno.h> #include <errno.h>
#endif #endif
#if defined( WIN32 ) || defined( UNDER_CE )
# include <winsock2.h>
# include <ws2tcpip.h>
#else
# include <sys/socket.h>
# include <netinet/in.h>
# include <netdb.h>
#endif
#include "network.h" #include "network.h"
/* FIXME: rwlock on acl, but libvlc doesn't implement rwlock */ /* FIXME: rwlock on acl, but libvlc doesn't implement rwlock */
......
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