* ALL: WinCE EVC compilation fixes.
authorGildas Bazin <gbazin@videolan.org>
Thu, 22 Sep 2005 20:14:20 +0000 (20:14 +0000)
committerGildas Bazin <gbazin@videolan.org>
Thu, 22 Sep 2005 20:14:20 +0000 (20:14 +0000)
evc/config.h.in
include/network.h
include/vlc_common.h
src/control/audio_video.c
src/control/core.c
src/control/util.c
src/misc/getaddrinfo.c
src/misc/net.c
src/stream_output/acl.c
src/stream_output/sap.c

index 7169150..f74a8d4 100644 (file)
 /* 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
index 81626f4..d484ba6 100644 (file)
 #   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>
index 586da1a..abecaea 100644 (file)
@@ -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
index 5b9b822..2ad53ad 100644 (file)
 #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);
index 3abb0a5..7185554 100644 (file)
 #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);
index ab68283..93e6414 100644 (file)
 #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);
index 6002a4e..25504e3 100644 (file)
 #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
index 34f96eb..a5b0820 100644 (file)
 #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
index f8040df..9a957d1 100644 (file)
@@ -31,9 +31,7 @@
 
 #include "vlc_acl.h"
 
-#ifdef HAVE_ERRNO_H
 #include <errno.h>
-#endif
 
 #include "network.h"
 
index ddc7ca5..15ce592 100644 (file)
 #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 */