Remove redundant UNDER_CE checks

WIN32 is defined also on WinCE anyway.

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 6514a94e813d6d9acf42b4013a395729911c4067..3a4bc534eb819110538c1cbea5809dfc788a3648 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -140,7 +140,7 @@
 /*****************************************************************************
  * Basic types definitions
  *****************************************************************************/
-#if defined( WIN32 ) || defined( UNDER_CE )
+#if defined( WIN32 )
 #   include <malloc.h>
 #   ifndef PATH_MAX
 #       define PATH_MAX MAX_PATH
@@ -426,7 +426,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 /*****************************************************************************
  * OS-specific headers and thread types
  *****************************************************************************/
-#if defined( WIN32 ) || defined( UNDER_CE )
+#if defined( WIN32 )
 # include <windows.h>
 #endif
 
@@ -783,7 +783,7 @@ static inline void SetQWLE (void *p, uint64_t qw)
 
 /* Stuff defined in src/extras/libc.c */
 
-#if defined(WIN32) || defined(UNDER_CE)
+#if defined(WIN32)
 /* win32, cl and icl support */
 #   if defined( _MSC_VER ) || !defined( __MINGW32__ )
 #       define __attribute__(x)
@@ -937,7 +937,7 @@ VLC_API const char * VLC_Compiler( void ) VLC_USED;
 #include "vlc_main.h"
 #include "vlc_configuration.h"
 
-#if defined( WIN32 ) || defined( UNDER_CE ) || defined( __SYMBIAN32__ ) || defined( __OS2__ )
+#if defined( WIN32 ) || defined( __SYMBIAN32__ ) || defined( __OS2__ )
 #   define DIR_SEP_CHAR '\\'
 #   define DIR_SEP "\\"
 #   define PATH_SEP_CHAR ';'

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index b3174b1a91e6e2342795dd21a23dbc39aa3b15ff..2a1d2559d46c577af39005b2cdac262cd0c71f35 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -82,7 +82,7 @@
 #   define VLC_THREAD_PRIORITY_OUTPUT  15
 #   define VLC_THREAD_PRIORITY_HIGHEST 20
 
-#elif defined(WIN32) || defined(UNDER_CE)
+#elif defined(WIN32)
 /* Define different priorities for WinNT/2K/XP and Win9x/Me */
 #   define VLC_THREAD_PRIORITY_LOW 0
 #   define VLC_THREAD_PRIORITY_INPUT \

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index db9cb3a85eaeb432905720586c4971f4c5f8d9b8..1a0b0a808a703451773d0897ed56b4616338a6e1 100644 (file)
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -533,7 +533,7 @@ static int ReadMeta( vlc_object_t* p_this)
     if( !psz_path )
         return VLC_ENOMEM;
 
-#if defined(WIN32) || defined (UNDER_CE)
+#if defined(WIN32)
     wchar_t *wpath = ToWide( psz_path );
     if( wpath == NULL )
     {
@@ -826,7 +826,7 @@ static int WriteMeta( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-#if defined(WIN32) || defined (UNDER_CE)
+#if defined(WIN32)
     wchar_t *wpath = ToWide( p_export->psz_file );
     if( wpath == NULL )
         return VLC_EGENERIC;

diff --git a/modules/misc/osd/simple.c b/modules/misc/osd/simple.c
index a18e4c222e2421651d9bab16d0d7ed3493c02e5b..bc3af4d2dcb808ebb6cab23650fdf1f517f30020 100644 (file)
--- a/modules/misc/osd/simple.c
+++ b/modules/misc/osd/simple.c
@@ -93,7 +93,7 @@ int osd_parser_simpleOpen( vlc_object_t *p_this )
          * so PATH_MAX-2 is the bigest we can have */
         if( i_len > PATH_MAX - 2 )
             i_len = PATH_MAX - 2;
-#if defined(WIN32) || defined(UNDER_CE) || defined(__OS2__)
+#if defined(WIN32) || defined(__OS2__)
         if( (i_len > 0) && path[i_len] != '\\' )
             path[i_len] = '\\';
 #else

diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index 1b4b9444fe683b69ee89651516dee32f558e5e2a..07f58dfb9c78637b7f2e28726cb4c9b06e22625a 100644 (file)
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -103,7 +103,7 @@ static int MouseEvent( filter_t *,
 
 #define OSD_CFG "osdmenu-"
 
-#if defined( WIN32 ) || defined( UNDER_CE )
+#if defined( WIN32 )
 #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
 #else
 #define OSD_DEFAULT_CFG PKGDATADIR"/osdmenu/default.cfg"

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 5052646557784dc3d1ed91cead07d8619c87a96a..62384a14aa0671683c057fa546806fd6b12395be 100644 (file)
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -1733,7 +1733,7 @@ static void httpd_ClientRecv( httpd_client_t *cl )
     }
 
     /* check if the client is to be set to dead */
-#if defined( WIN32 ) || defined( UNDER_CE )
+#if defined( WIN32 )
     if( ( i_len < 0 && WSAGetLastError() != WSAEWOULDBLOCK ) || ( i_len == 0 ) )
 #else
     if( ( i_len < 0 && errno != EAGAIN ) || ( i_len == 0 ) )
@@ -1872,7 +1872,7 @@ static void httpd_ClientSend( httpd_client_t *cl )
     }
     else
     {
-#if defined( WIN32 ) || defined( UNDER_CE )
+#if defined( WIN32 )
         if( ( i_len < 0 && WSAGetLastError() != WSAEWOULDBLOCK ) || ( i_len == 0 ) )
 #else
         if( ( i_len < 0 && errno != EAGAIN ) || ( i_len == 0 ) )

diff --git a/src/network/io.c b/src/network/io.c
index 439c598369bdcaf46e8591c9694dfaff522da3fe..f651a8ecbf5c370413ee3d5821ac9ac7403fc822 100644 (file)
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -58,7 +58,7 @@
 #   define INADDR_NONE 0xFFFFFFFF
 #endif
 
-#if defined(WIN32) || defined(UNDER_CE)
+#if defined(WIN32)
 # undef EAFNOSUPPORT
 # define EAFNOSUPPORT WSAEAFNOSUPPORT
 #endif
@@ -96,7 +96,7 @@ int net_Socket (vlc_object_t *p_this, int family, int socktype,
         setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &(int){ 1 }, sizeof (int));
 #endif
 
-#if defined (WIN32) || defined (UNDER_CE)
+#if defined (WIN32)
 # ifndef IPV6_PROTECTION_LEVEL
 #  warning Please update your C library headers.
 #  define IPV6_PROTECTION_LEVEL 23
@@ -159,7 +159,7 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host,
         }
 
         /* Bind the socket */
-#if defined (WIN32) || defined (UNDER_CE)
+#if defined (WIN32)
         /*
          * Under Win32 and for multicasting, we bind to INADDR_ANY.
          * This is of course a severe bug, since the socket would logically
@@ -183,7 +183,7 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host,
         if (bind (fd, ptr->ai_addr, ptr->ai_addrlen))
         {
             net_Close (fd);
-#if !defined(WIN32) && !defined(UNDER_CE)
+#if !defined(WIN32)
             fd = rootwrap_bind (ptr->ai_family, ptr->ai_socktype,
                                 ptr->ai_protocol,
                                 ptr->ai_addr, ptr->ai_addrlen);
@@ -290,7 +290,7 @@ net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
             {
                 assert (p_this->b_die);
                 msg_Dbg (p_this, "socket %d polling interrupted", fd);
-#if defined(WIN32) || defined(UNDER_CE)
+#if defined(WIN32)
                 WSASetLastError (WSAEINTR);
 #else
                 errno = EINTR;
@@ -302,14 +302,14 @@ net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
         assert (ufd[0].revents);
 
         ssize_t n;
-#if defined(WIN32) || defined(UNDER_CE)
+#if defined(WIN32)
         int error;
 #endif
         if (vs != NULL)
         {
             int canc = vlc_savecancel ();
             n = vs->pf_recv (vs->p_sys, p_buf, i_buflen);
-#if defined(WIN32) || defined(UNDER_CE)
+#if defined(WIN32)
             /* We must read last error immediately, because vlc_restorecancel()
              * access thread local storage, and TlsGetValue() will call
              * SetLastError() to indicate that the function succeeded, thus
@@ -332,7 +332,7 @@ net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
 
         if (n == -1)
         {
-#if defined(WIN32) || defined(UNDER_CE)
+#if defined(WIN32)
             switch (error)
             {
                 case WSAEWOULDBLOCK:

diff --git a/src/network/tcp.c b/src/network/tcp.c
index a3a8eabd43b0dff156bfb5aceb21e69e63dac31a..fd8f738bb078418b699e84ccffbbc9ecaecafe2c 100644 (file)
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -43,7 +43,7 @@
 #endif
 
 #include <vlc_network.h>
-#if defined (WIN32) || defined (UNDER_CE)
+#if defined (WIN32)
 #   undef EINPROGRESS
 #   define EINPROGRESS WSAEWOULDBLOCK
 #   undef EWOULDBLOCK

diff --git a/src/network/udp.c b/src/network/udp.c
index 1db1837039483121d9c9a1ed8c97881d37b4f61f..d8dc9d59ce5dd9d31113251bddbcb56dfa7eec46 100644 (file)
--- a/src/network/udp.c
+++ b/src/network/udp.c
@@ -110,7 +110,7 @@ static int net_SetupDgramSocket (vlc_object_t *p_obj, int fd,
                 (void *)&(int){ 0x80000 }, sizeof (int));
 #endif
 
-#if defined (WIN32) || defined (UNDER_CE)
+#if defined (WIN32)
     if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen)
      && (sizeof (struct sockaddr_storage) >= ptr->ai_addrlen))
     {
@@ -559,7 +559,7 @@ int net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port,
             break;
         }
 
-#if defined( WIN32 ) || defined( UNDER_CE )
+#if defined( WIN32 )
         if( WSAGetLastError () == WSAENETUNREACH )
 #else
         if( errno == ENETUNREACH )

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index 9587cf7314e73e81dc457c2bfc9677c55c75c578..34e2b268460f2a418e88bf87a953bda8655750dd 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -620,7 +620,7 @@ static int mrl_Parse( mrl_t *p_mrl, const char *psz_mrl )
             psz_parser++;
         }
     }
-#if defined( WIN32 ) || defined( UNDER_CE ) || defined( __OS2__ )
+#if defined( WIN32 ) || defined( __OS2__ )
     if( psz_parser - psz_dup == 1 )
     {
         /* msg_Warn( p_sout, "drive letter %c: found in source string",