* ALL: WinCE EVC compilation fixes.

evc/config.h.in

@@ -93,6 +93,18 @@
 /* Simple version string */
 #define VERSION_MESSAGE "@VERSION@ @CODENAME@"
 
+/* compiler */
+#define VLC_COMPILER "Microsoft eMbedded Visual C++"
+
+/* user who ran configure */
+#define VLC_COMPILE_BY "user"
+
+/* domain of the host which ran configure */
+#define VLC_COMPILE_DOMAIN "videolan.org"
+
+/* host which ran configure */
+#define VLC_COMPILE_HOST "machine"
+
 /* Define as `__inline' if that's what the C compiler calls it, or to nothing
    if it is not supported. */
 #define inline __inline

include/network.h

@@ -30,8 +30,14 @@
 #   if defined(UNDER_CE) && defined(sockaddr_storage)
 #       undef sockaddr_storage
 #   endif
+#   if defined(UNDER_CE)
+#       define HAVE_STRUCT_ADDRINFO
+#   else
+#       include <io.h>
+#   endif
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
+#   define ENETUNREACH WSAENETUNREACH
 #else
 #   if HAVE_SYS_SOCKET_H
 #      include <sys/socket.h>

include/vlc_common.h

@@ -546,7 +546,7 @@ static int64_t GCD( int64_t a, int64_t b )
 }
 
 /* Dynamic array handling: realloc array, move data, increment position */
-#if defined( _MSC_VER ) && _MSC_VER < 1300
+#if defined( _MSC_VER ) && _MSC_VER < 1300 && !defined( UNDER_CE )
 #   define VLCCVP (void**) /* Work-around for broken compiler */
 #else
 #   define VLCCVP

src/control/audio_video.c

@@ -46,11 +46,12 @@
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-
 #ifdef HAVE_SYS_TIME_H
 #    include <sys/time.h>
 #endif
-#include <sys/types.h>
+#ifdef HAVE_SYS_TYPES_H
+#    include <sys/types.h>
+#endif
 
 #define RAISE( c, m )  exception->code = c; \
                        exception->message = strdup(m);

src/control/core.c

@@ -46,11 +46,12 @@
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-
 #ifdef HAVE_SYS_TIME_H
 #    include <sys/time.h>
 #endif
-#include <sys/types.h>
+#ifdef HAVE_SYS_TYPES_H
+#    include <sys/types.h>
+#endif
 
 #define RAISE( c, m )  exception->code = c; \
                        exception->message = strdup(m);

src/control/util.c

@@ -46,11 +46,12 @@
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-
 #ifdef HAVE_SYS_TIME_H
 #    include <sys/time.h>
 #endif
-#include <sys/types.h>
+#ifdef HAVE_SYS_TYPES_H
+#    include <sys/types.h>
+#endif
 
 #define RAISE( c, m )  exception->code = c; \
                        exception->message = strdup(m);

src/misc/getaddrinfo.c

@@ -27,30 +27,17 @@
 #include <stddef.h> /* size_t */
 #include <string.h> /* strncpy(), strlen(), memcpy(), memset(), strchr() */
 #include <stdlib.h> /* malloc(), free(), strtoul() */
-#include <sys/types.h>
+#include <errno.h>
+
+#ifdef HAVE_SYS_TYPES_H
+#   include <sys/types.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #   include <arpa/inet.h>
 #endif
 #ifdef HAVE_NETINET_IN_H
 #   include <netinet/in.h>
 #endif
-#include <errno.h>
-
-#if defined( WIN32 ) || defined( UNDER_CE )
-#   if defined(UNDER_CE) && defined(sockaddr_storage)
-#       undef sockaddr_storage
-#   endif
-#   include <winsock2.h>
-#   include <ws2tcpip.h>
-#else
-#   include <sys/socket.h>
-#   include <netinet/in.h>
-#   ifdef HAVE_ARPA_INET_H
-#       include <arpa/inet.h>
-#   endif
-#   include <netdb.h>
-#endif
-
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif

src/misc/net.c

@@ -33,28 +33,9 @@
 #ifdef HAVE_FCNTL_H
 #   include <fcntl.h>
 #endif
-
 #ifdef HAVE_SYS_TIME_H
 #    include <sys/time.h>
 #endif
-
-#if defined( WIN32 ) || defined( UNDER_CE )
-#   if defined(UNDER_CE) && defined(sockaddr_storage)
-#       undef sockaddr_storage
-#   endif
-#   include <io.h>
-#   include <winsock2.h>
-#   include <ws2tcpip.h>
-#   define ENETUNREACH WSAENETUNREACH
-#else
-#   include <sys/socket.h>
-#   include <netinet/in.h>
-#   ifdef HAVE_ARPA_INET_H
-#       include <arpa/inet.h>
-#   endif
-#   include <netdb.h>
-#endif
-
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif

src/stream_output/acl.c

@@ -31,9 +31,7 @@
 
 #include "vlc_acl.h"
 
-#ifdef HAVE_ERRNO_H
 #include <errno.h>
-#endif
 
 #include "network.h"
 

src/stream_output/sap.c

@@ -34,18 +34,6 @@
 #include <vlc/sout.h>
 
 #include "network.h"
-#if defined( WIN32 ) || defined( UNDER_CE )
-#   if defined(UNDER_CE) && defined(sockaddr_storage)
-#       undef sockaddr_storage
-#   endif
-#   include <winsock2.h>
-#   include <ws2tcpip.h>
-#else
-#   include <netdb.h>
-#   ifdef HAVE_ARPA_INET_H
-#       include <arpa/inet.h>
-#   endif
-#endif
 #include "charset.h"
 
 /* SAP is always on that port */