* ALL: WinCE EVC compilation fixes.

diff --git a/evc/config.h.in b/evc/config.h.in
index 716915019165c80874c735fe2735496658fae3b3..f74a8d43fec1c284205733c30ff3a9ff81c49591 100644 (file)
--- a/evc/config.h.in
+++ b/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

diff --git a/include/network.h b/include/network.h
index 81626f453320c94cce884fedf93b617e378bd7a0..d484ba6bcb4fd995b4c92c3f29d7b9e9aeae7130 100644 (file)
--- a/include/network.h
+++ b/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>

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 586da1a5779baea95e1cc42326f8411045c6ff17..abecaea0092f23685e52423533581ea0f53260c1 100644 (file)
--- a/include/vlc_common.h
+++ b/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

diff --git a/src/control/audio_video.c b/src/control/audio_video.c
index 5b9b822101bc0e93e36aa593affea367a51ecade..2ad53adb9a935ce937a6249d769e9c5da53670d7 100644 (file)
--- a/src/control/audio_video.c
+++ b/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);

diff --git a/src/control/core.c b/src/control/core.c
index 3abb0a52e3b1c6629daf88a0ab38e56387d149b1..7185554c723f5e5760a8e52c394d7a9c5d2c17af 100644 (file)
--- a/src/control/core.c
+++ b/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);

diff --git a/src/control/util.c b/src/control/util.c
index ab682834caa3160079a064e91f1445342b79f9f3..93e64147ac504274ece4e8371a4580a5c558af70 100644 (file)
--- a/src/control/util.c
+++ b/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);

diff --git a/src/misc/getaddrinfo.c b/src/misc/getaddrinfo.c
index 6002a4ec5961ce9b60f76c662d5939087d3be5e8..25504e39f8801a42aaf3215b2b436d2f345bad8e 100644 (file)
--- a/src/misc/getaddrinfo.c
+++ b/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>
+#   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

diff --git a/src/misc/net.c b/src/misc/net.c
index 34f96eb6e52f99bd8af98ac1ef7f970a58246229..a5b0820cb669e805d7c19db7e3308e41790703bc 100644 (file)
--- a/src/misc/net.c
+++ b/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

diff --git a/src/stream_output/acl.c b/src/stream_output/acl.c
index f8040df8b8b403022612054ccf262c8bcf460f3e..9a957d1a7a50df82390830c5e1859d9609763c5c 100644 (file)
--- a/src/stream_output/acl.c
+++ b/src/stream_output/acl.c
@@ -31,9 +31,7 @@
 
 #include "vlc_acl.h"
 
-#ifdef HAVE_ERRNO_H
 #include <errno.h>
-#endif
 
 #include "network.h"
 

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index ddc7ca5b13b45acc8fab0cc8efba4a8bb227917c..15ce59259a904dd79dd8c2d49006a08139abbe99 100644 (file)
--- a/src/stream_output/sap.c
+++ b/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 */