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

diff --git a/include/network.h b/include/network.h
index 62af2faf43bbb3671a365e6bd6c4753a03828860..f726f482df3de6bb9d2715a993edbc1ec474bb3d 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -26,16 +26,25 @@
 #ifndef __VLC_NETWORK_H
 # define __VLC_NETWORK_H
 
-#if defined( UNDER_CE )
-#   include <winsock.h>
-#elif defined( WIN32 )
+#if defined( WIN32 )
+#   if defined(UNDER_CE) && defined(sockaddr_storage)
+#       undef sockaddr_storage
+#   endif
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
 #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>
-#if HAVE_SYS_SOCKET_H
-#   include <sys/socket.h>
-#endif
 #endif
 
 

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index a5a0dc81d2cf7cd9cad3b71c994dea9e294be8cc..034b15233402d8c9e153f0a3e9982ab2a8f054ff 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -47,24 +47,6 @@
 #   include <sys/stat.h>
 #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 "asf.h"
 #include "buffer.h"

diff --git a/src/stream_output/acl.c b/src/stream_output/acl.c
index 3907e6c3d9e4e4bf6f8a243a3069a44b3f490971..f8040df8b8b403022612054ccf262c8bcf460f3e 100644 (file)
--- a/src/stream_output/acl.c
+++ b/src/stream_output/acl.c
@@ -35,15 +35,6 @@
 #include <errno.h>
 #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"
 
 /* FIXME: rwlock on acl, but libvlc doesn't implement rwlock */