[vlc-commits] Remove redundant UNDER_CE checks
Rémi Denis-Courmont
git at videolan.org
Sun Sep 2 09:57:26 CEST 2012
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 1 16:54:44 2012 +0300| [a5b8b24f212e8aac622d120651aecc8dbc81dbb0] | committer: Rémi Denis-Courmont
Remove redundant UNDER_CE checks
WIN32 is defined also on WinCE anyway.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a5b8b24f212e8aac622d120651aecc8dbc81dbb0
---
include/vlc_common.h | 8 ++++----
include/vlc_threads.h | 2 +-
modules/meta_engine/taglib.cpp | 4 ++--
modules/misc/osd/simple.c | 2 +-
modules/video_filter/osdmenu.c | 2 +-
src/network/httpd.c | 4 ++--
src/network/io.c | 16 ++++++++--------
src/network/tcp.c | 2 +-
src/network/udp.c | 4 ++--
src/stream_output/stream_output.c | 2 +-
10 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 6514a94..3a4bc53 100644
--- 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 b3174b1..2a1d255 100644
--- 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 db9cb3a..1a0b0a8 100644
--- 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 a18e4c2..bc3af4d 100644
--- 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 1b4b944..07f58df 100644
--- 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 5052646..62384a1 100644
--- 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 439c598..f651a8e 100644
--- 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 a3a8eab..fd8f738 100644
--- 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 1db1837..d8dc9d5 100644
--- 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 9587cf7..34e2b26 100644
--- 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",
More information about the vlc-commits
mailing list