Remove WinCE

a7b2dcf0 · Rémi Denis-Courmont · a5b8b24f · a7b2dcf0 · a7b2dcf0 · a7b2dcf0
Commit a7b2dcf0 authored Sep 02, 2012 by Rémi Denis-Courmont
49 changed files
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -14,20 +14,15 @@ AM_CFLAGS = $(CFLAGS_vlc)


 if !HAVE_WIN32
-if !HAVE_WINCE
 bin_PROGRAMS += vlc-wrapper
 vlc_SOURCES = vlc.c override.c
 endif
-endif

 EXTRA_vlc_SOURCES = vlc.c winvlc.c
 if HAVE_WIN32
 vlc_SOURCES = winvlc.c
 noinst_DATA += vlc_win32_rc.rc
 endif
-if HAVE_WINCE
-vlc_SOURCES = winvlc.c
-endif

 vlc_wrapper_SOURCES = rootwrap.c
 vlc_wrapper_LDADD = $(SOCKET_LIBS)

--- a/bin/winvlc.c
+++ b/bin/winvlc.c
@@ -33,23 +33,20 @@
 #include <windows.h>
 #include <shellapi.h>

-#if !defined(UNDER_CE)
-# ifndef _WIN32_IE
-#   define  _WIN32_IE 0x501
-# endif
-# include <fcntl.h>
-# include <io.h>
-# include <shlobj.h>
-# include <wininet.h>
-# define PSAPI_VERSION 1
-# include <psapi.h>
-# define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS)1
+#ifndef _WIN32_IE
+#  define  _WIN32_IE 0x501
+#endif
+#include <fcntl.h>
+#include <io.h>
+#include <shlobj.h>
+#include <wininet.h>
+#define PSAPI_VERSION 1
+#include <psapi.h>
+#define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS)1
 static void check_crashdump(void);
 LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo);
 static const wchar_t *crashdump_path;
-#endif

-#ifndef UNDER_CE
 static char *FromWide (const wchar_t *wide)
 {
    size_t len;
@@ -60,67 +57,13 @@ static char *FromWide (const wchar_t *wide)
        WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL);
    return out;
 }
-#else
-static int parse_cmdline (char *line, char ***argvp)
-{
-    char **argv = malloc (sizeof (char *));
-    int argc = 0;
-
-    while (*line != '\0')
-    {
-        char quote = 0;
-
-        /* Skips white spaces */
-        while (strchr ("\t ", *line))
-            line++;
-        if (!*line)
-            break;
-
-        /* Starts a new parameter */
-        argv = realloc (argv, (argc + 2) * sizeof (char *));
-        if (*line == '"')
-        {
-            quote = '"';
-            line++;
-        }
-        argv[argc++] = line;
-
-    more:
-            while (*line && !strchr ("\t ", *line))
-            line++;
-
-    if (line > argv[argc - 1] && line[-1] == quote)
-        /* End of quoted parameter */
-        line[-1] = 0;
-    else
-        if (*line && quote)
-    {
-        /* Space within a quote */
-        line++;
-        goto more;
-    }
-    else
-        /* End of unquoted parameter */
-        if (*line)
-            *line++ = 0;
-    }
-    argv[argc] = NULL;
-    *argvp = argv;
-    return argc;
-}
-#endif

 int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
-#ifndef UNDER_CE
                    LPSTR lpCmdLine,
-#else
-                    LPWSTR lpCmdLine,
-#endif
                    int nCmdShow )
 {
    int argc;

-#ifndef UNDER_CE
    /* VLC does not change the thread locale, so gettext/libintil will use the
     * user default locale as reference. */
    /* gettext versions 0.18-0.18.1 will use the Windows Vista locale name
@@ -198,15 +141,6 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,

    _setmode( STDIN_FILENO, _O_BINARY ); /* Needed for pipes */

-#else /* UNDER_CE */
-    char **argv, psz_cmdline[wcslen(lpCmdLine) * 4];
-
-    WideCharToMultiByte( CP_UTF8, 0, lpCmdLine, -1,
-                         psz_cmdline, sizeof (psz_cmdline), NULL, NULL );
-
-    argc = parse_cmdline (psz_cmdline, &argv);
-#endif
-
    /* Initialize libvlc */
    libvlc_instance_t *vlc;
    vlc = libvlc_new (argc, (const char **)argv);
@@ -227,7 +161,6 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
    return 0;
 }

-#if !defined( UNDER_CE )
 /* Crashdumps handling */
 static void check_crashdump(void)
 {
@@ -402,4 +335,3 @@ LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo)
        exit( 1 );
    }
 }
-#endif
--- a/compat/fsync.c
+++ b/compat/fsync.c
@@ -28,7 +28,7 @@

 int fsync (int fd)
 {
-#if defined(WIN32) && !defined(UNDER_CE)
+#if defined(WIN32)
    /* WinCE can use FlushFileBuffers() but it operates on file handles */
    return _commit (fd);
 #else

--- a/configure.ac
+++ b/configure.ac
@@ -209,10 +209,6 @@ case "${host_os}" in
    AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.])

    case "${host_os}" in
-      *wince* | *mingwce* | *mingw32ce*)
-        SYS=mingwce
-        dnl Sadly CeGCC still needs non-wince macros
-        ;;
      *mingw32*)
        SYS=mingw32
        ;;
@@ -251,12 +247,6 @@ case "${host_os}" in
        AC_SUBST(PROGRAMFILES)

    fi
-    if test "${SYS}" = "mingwce"; then
-        VLC_ADD_LIBS([libvlccore],[-lmmtimer])
-        AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
-        ac_default_prefix="`pwd`/_wince"
-        DESTDIR="`pwd`/_wince/"
-    fi
    ;;
  *nto*)
    SYS=nto
@@ -283,7 +273,6 @@ AM_CONDITIONAL(HAVE_LINUX,   test "${SYS}" = "linux")
 AM_CONDITIONAL(HAVE_OS2,     test "${SYS}" = "os2")
 AM_CONDITIONAL(HAVE_WIN32,   test "${SYS}" = "mingw32")
 AM_CONDITIONAL(HAVE_WIN64,   test "${HAVE_WIN64}" = "1")
-AM_CONDITIONAL(HAVE_WINCE,   test "${SYS}" = "mingwce")
 AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")

 dnl
@@ -422,7 +411,7 @@ dnl
 AM_ICONV

 dnl Check for broken versions of mingw-runtime compatability library
-AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
+AS_IF([test "${SYS}" = "mingw32"], [
    AC_MSG_CHECKING(for broken mingw-runtime)
    AC_PREPROC_IFELSE([AC_LANG_SOURCE([
 #include <_mingw.h>
@@ -567,9 +556,6 @@ AC_SEARCH_LIBS(connect, [socket], [
  AS_IF([test "${SYS}" = "mingw32"], [
    SOCKET_LIBS="-lws2_32"
  ])
-  AS_IF([test "${SYS}" = "mingwce"], [
-    SOCKET_LIBS="-lws2"
-  ])
 ])

 AC_SEARCH_LIBS([getaddrinfo], [nsl], [
@@ -609,9 +595,7 @@ AH_TEMPLATE(ss_family, [Define to `sa_family' if <sys/socket.h> does not define.
 AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage,
  [AC_TRY_COMPILE(
    [#include <sys/types.h>
-     #if defined( UNDER_CE )
-     # include <winsock2.h>
-     #elif defined( WIN32 )
+     #if defined( WIN32 )
     # include <winsock2.h>
     #else
     # include <sys/socket.h>
@@ -658,7 +642,7 @@ AC_SEARCH_LIBS(dlopen, [dl svld], [
 VLC_RESTORE_FLAGS

 # Windows
-AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
+AS_IF([test "${SYS}" = "mingw32"], [
  LIBDL=""
  have_dynamic_objects="yes" #assume we can use shared objects
 ])
@@ -678,7 +662,7 @@ AC_SUBST(LIBDL)
 VLC_ADD_LIBS([lua],[$LIBDL])

 dnl Check for thread library
-if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
+if test "${SYS}" != "mingw32"; then

  VLC_SAVE_FLAGS
  LIBS=""
@@ -702,7 +686,7 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
    dnl HP/UX port
    AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])])
  ])
-fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
+fi # end "${SYS}" != "mingw32"

 dnl Check for headers
 AC_CHECK_HEADERS([search.h])
@@ -719,11 +703,11 @@ AC_CHECK_HEADERS([sys/mount.h], [], [],
    #include <sys/param.h>
  ])

-if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
+if test "${SYS}" != "mingw32"; then
  AC_CHECK_HEADERS(machine/param.h sys/shm.h)
  AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h])
  AC_CHECK_HEADERS(syslog.h mntent.h)
-fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
+fi # end "${SYS}" != "mingw32"

 dnl LP64 and LLP64 architectures had better define ssize_t by themselves...
 AH_TEMPLATE(ssize_t, [Define to `int' if <stddef.h> does not define.]) dnl ` (fix VIM syntax highlight
@@ -732,9 +716,9 @@ AC_CHECK_TYPE(ssize_t,, [
 ])

 dnl Check for threads library
-if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
+if test "${SYS}" != "mingw32"; then
  AC_CHECK_HEADERS(pthread.h)
-fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
+fi # end "${SYS}" != "mingw32"

 dnl It seems that autoconf detects pkg-config only during the first
 dnl PKG_CHECK_MODULES from configure.ac - which makes sense. But in our case,
@@ -746,7 +730,7 @@ PKG_PROG_PKG_CONFIG()

 dnl On some OS we need static linking
 AS_IF([test -n "${PKG_CONFIG}" ],[
-    AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" ],[
+    AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" ],[
        PKG_CONFIG="${PKG_CONFIG} --static"
    ])
 ])
@@ -793,7 +777,7 @@ AC_ARG_ENABLE(dbus,
    [compile D-Bus message bus support (default enabled)])])
 case "${SYS}" in
    linux*|*bsd*)
-if test "${enable_dbus}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
+if test "${enable_dbus}" != "no" -a "${SYS}" != "mingw32"
 then
  dnl api stable dbus
  PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0.0],
@@ -896,7 +880,7 @@ AS_IF([test "${enable_coverage}" != "no"], [
  LDFLAGS="-lgcov ${LDFLAGS}"
 ])

-AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
+AS_IF([test "${SYS}" != "mingw32"], [
  VLC_SAVE_FLAGS
  CFLAGS="${CFLAGS} -fvisibility=hidden"
  CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
@@ -1076,13 +1060,9 @@ dnl Some plugins aren't useful on some platforms
 dnl
 if test "${SYS}" = "os2"; then
    VLC_ADD_PLUGIN([dynamicoverlay])
-elif test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
+elif test "${SYS}" != "mingw32"; then
    VLC_ADD_PLUGIN([dynamicoverlay access_shm])
-elif test "${SYS}" != "mingwce"; then
-    VLC_ADD_PLUGIN([access_smb dmo globalhotkeys])
-    VLC_ADD_LIBS([dmo],[-lole32 -luuid])
-fi
-if test "${SYS}" = "darwin"; then
+elif test "${SYS}" = "darwin"; then
    VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices])
 fi

@@ -1664,9 +1644,6 @@ You can get an updated one from http://www.live555.com/liveMedia .])
    AS_IF([test "${SYS}" = "mingw32"], [
      # add ws2_32 for closesocket, select, recv
      other_libs="$other_libs -lws2_32"
-    ], [test "${SYS}" = "mingwce"], [
-      # add ws2 for closesocket, select, recv
-      other_libs="$other_libs -lws2"
    ])

    dnl We need to check for pic because live555 don't provide shared libs
@@ -3011,7 +2988,7 @@ dnl  X C Bindings modules
 dnl
 AC_ARG_ENABLE(xcb,
  [  --enable-xcb            X11 support with XCB (default enabled)],, [
-  AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin" -a "${SYS}" != "symbian"], [
+  AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" -a "${SYS}" != "symbian"], [
    enable_xcb="yes"
  ], [
    enable_xcb="no"
@@ -3214,7 +3191,7 @@ dnl
 dnl  Windows DirectX module
 dnl

-if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"
+if test "${SYS}" = "mingw32"
 then
  VLC_ADD_PLUGIN([panoramix])
 fi
@@ -3222,7 +3199,7 @@ fi
 AC_ARG_ENABLE(directx,
  [AS_HELP_STRING([--enable-directx],
    [Microsoft DirectX support (default enabled on Windows)])],, [
-  AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
+  AS_IF([test "${SYS}" = "mingw32"], [
    enable_directx="yes"
  ], [
    enable_directx="no"
@@ -3260,7 +3237,7 @@ dnl  Windows Direct2D plugin
 dnl
 AC_ARG_ENABLE(direct2d,
  [  --enable-direct2d       Win7/VistaPU Direct2D support (default auto on Win32)],, [
-  AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
+  AS_IF([test "${SYS}" != "mingw32"], [
    enable_direct2d="no"
  ])
 ])
@@ -3283,11 +3260,6 @@ if test "${enable_wingdi}" != "no"; then
    VLC_ADD_PLUGIN([wingdi])
    VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32 -luuid])
  fi
-  if test "${SYS}" = "mingwce"; then
-    VLC_ADD_PLUGIN([wingdi wingapi])
-    VLC_ADD_LIBS([wingdi],[-laygshell])
-    VLC_ADD_LIBS([wingapi],[-laygshell])
-  fi
 fi


@@ -3473,7 +3445,7 @@ dnl
 AC_ARG_ENABLE(oss,
  [AS_HELP_STRING([--enable-oss],
    [support the Open Sound System OSS (default enabled on FreeBSD/NetBSD/DragonFlyBSD)])],, [
-  AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "mingwce" -o "$SYS" = "linux" -o "$SYS" = "openbsd"], [
+  AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "linux" -o "$SYS" = "openbsd"], [
    enable_oss="no"
  ])
 ])
@@ -3537,9 +3509,6 @@ if test "${enable_waveout}" != "no"; then
    VLC_ADD_PLUGIN([waveout])
    VLC_ADD_LIBS([waveout],[-lwinmm])
  fi
-  if test "${SYS}" = "mingwce"; then
-    VLC_ADD_PLUGIN([waveout])
-  fi
 fi

 dnl
@@ -3667,7 +3636,7 @@ AS_IF([test "${enable_qt}" != "no"], [
  VLC_RESTORE_FLAGS
  AC_LANG_POP([C++])

-  AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
+  AS_IF([test "${SYS}" = "mingw32"], [
      VLC_ADD_LIBS([qt4],[-lole32])
  ])
  AS_IF([test "${SYS}" = "darwin" ],[
@@ -4082,7 +4051,7 @@ AC_ARG_WITH(kde-solid,
  AS_HELP_STRING([--with-kde-solid=PATH],
                 [KDE Solid actions directory (auto)]),, [

-if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin" ; then
+if test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" ; then
  with_kde_solid="yes"
 fi
 ])

--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -10,14 +10,9 @@ win32_xpi_destdir=$(abs_top_builddir)/vlc-plugin-$(VERSION)
 7Z_OPTS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on


-if HAVE_WINCE
-build-npapi:
-	touch $@
-else
 if HAVE_WIN32
 include extras/package/npapi.am
 endif
-endif

 if HAVE_WIN64
 WINVERSION=vlc-$(VERSION)-win64
@@ -67,12 +62,10 @@ if BUILD_OSDMENU
 	done
 endif

-if !HAVE_WINCE
 	cp "$(top_builddir)/npapi-vlc/activex/axvlc.dll.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/npapi-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
 	cp "$(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
-endif

 # Compiler shared DLLs, when using compilers built with --enable-shared
 # If gcc_s_sjlj/stdc++-6 DLLs exist, our C++ modules were linked to them
@@ -84,13 +77,11 @@ endif
 	cp -r $(prefix)/include "$(win32_destdir)/sdk"
 	cp -r $(prefix)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
 	cd $(prefix)/lib && cp -rv libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la "$(win32_destdir)/sdk/lib/"
-if !HAVE_WINCE
 	$(DLLTOOL) -D libvlc.dll -l "$(win32_destdir)/sdk/lib/libvlc.lib" -d "$(top_builddir)/lib/.libs/libvlc.dll.def" "$(prefix)/bin/libvlc.dll"
 	$(DLLTOOL) -D libvlccore.dll -l "$(win32_destdir)/sdk/lib/libvlccore.lib" -d "$(top_builddir)/src/.libs/libvlccore.dll.def" "$(prefix)/bin/libvlccore.dll"

 	mkdir -p "$(win32_destdir)/sdk/activex/"
 	cd $(top_builddir)/npapi-vlc && cp activex/README.TXT share/test.html $(win32_destdir)/sdk/activex/
-endif

 # Convert to DOS line endings
 	find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) {} \;

--- a/include/vlc_arrays.h
+++ b/include/vlc_arrays.h
@@ -40,7 +40,7 @@ static inline void *realloc_down( void *ptr, size_t size )
 /**
 * Simple dynamic array handling. Array is realloced at each insert/removal
 */
-#if defined( _MSC_VER ) && _MSC_VER < 1300 && !defined( UNDER_CE )
+#if defined( _MSC_VER ) && _MSC_VER < 1300
 #   define VLCCVP (void**) /* Work-around for broken compiler */
 #else
 #   define VLCCVP

--- a/include/vlc_fs.h
+++ b/include/vlc_fs.h
@@ -65,15 +65,13 @@ static inline void vlc_rewinddir( DIR *dir )
 # define rewinddir vlc_rewinddir

 # include <sys/stat.h>
-# ifndef UNDER_CE
-#  ifndef stat
-#   define stat _stati64
-#  endif
-#  ifndef fstat
-#   define fstat _fstati64
-#  endif
-# define lseek _lseeki64
+# ifndef stat
+#  define stat _stati64
 # endif
+# ifndef fstat
+#  define fstat _fstati64
+# endif
+#define lseek _lseeki64
 #endif

 #ifdef __ANDROID__

--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -126,7 +126,7 @@ VLC_API void vlc_Unsubscribe(msg_subscription_t *);

 /*@}*/

-#if defined( WIN32 ) && !defined( UNDER_CE )
+#if defined( WIN32 )
 #    define CONSOLE_INTRO_MSG \
         if( !getenv( "PWD" ) ) /* detect Cygwin shell or Wine */ \
         { \

--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -33,10 +33,8 @@
 */

 #if defined( WIN32 )
-#   if !defined(UNDER_CE)
-#       define _NO_OLDNAMES 1
-#       include <io.h>
-#   endif
+#   define _NO_OLDNAMES 1
+#   include <io.h>
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
 #   define net_errno (WSAGetLastError())

--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -34,8 +34,7 @@
 *
 */

-#if defined( UNDER_CE )
-#elif defined( WIN32 )
+#if defined( WIN32 )
 #   include <process.h>                                         /* Win32 API */

 #elif defined( __OS2__ )                                        /* OS/2 API  */
@@ -456,7 +455,7 @@ static inline void vlc_spin_destroy (vlc_spinlock_t *spin)
    pthread_spin_destroy (spin);
 }

-#elif defined (WIN32) && !defined (UNDER_CE)
+#elif defined (WIN32)

 typedef CRITICAL_SECTION vlc_spinlock_t;


--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -40,7 +40,7 @@
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #   include <fcntl.h>
-#elif defined( WIN32 ) && !defined( UNDER_CE )
+#elif defined( WIN32 )
 #   include <io.h>
 #endif


--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -36,7 +36,7 @@
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
-#elif defined( WIN32 ) && !defined( UNDER_CE )
+#elif defined( WIN32 )
 #   include <io.h>
 #endif


--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -114,7 +114,7 @@ static bool IsRemote (int fd)
 #else /* WIN32 || __OS2__ */
 static bool IsRemote (const char *path)
 {
-# if !defined(UNDER_CE) && !defined(__OS2__)
+# if !defined(__OS2__)
    wchar_t *wpath = ToWide (path);
    bool is_remote = (wpath != NULL && PathIsNetworkPathW (wpath));
    free (wpath);

--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -1023,10 +1023,6 @@ static int mms_CommandSend( access_t *p_access, int i_command,

 static int NetFillBuffer( access_t *p_access )
 {
-#ifdef UNDER_CE
-    return -1;
-
-#else
    access_sys_t    *p_sys = p_access->p_sys;
    int             i_ret;
    struct pollfd   ufd[2];
@@ -1143,7 +1139,6 @@ static int NetFillBuffer( access_t *p_access )
    if( i_udp_read > 0 ) p_sys->i_buffer_udp += i_udp_read;

    return i_tcp_read + i_udp_read;
-#endif
 }

 static int  mms_ParseCommand( access_t *p_access,

--- a/modules/access/vdr.c
+++ b/modules/access/vdr.c
@@ -50,7 +50,7 @@ See http://www.vdr-wiki.de/ and http://www.tvdr.de/ for more information.
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
-#elif defined( WIN32 ) && !defined( UNDER_CE )
+#elif defined( WIN32 )
 #   include <io.h>
 #endif


--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -136,7 +136,6 @@ static int Open( vlc_object_t *p_this )
            return VLC_EGENERIC;
        }
    }
-#ifndef UNDER_CE
    else
    if( !strcmp( p_access->psz_path, "-" ) )
    {
@@ -151,7 +150,6 @@ static int Open( vlc_object_t *p_this )
        }
        msg_Dbg( p_access, "using stdout" );
    }
-#endif
    else
    {
        char *psz_tmp = str_format_time( p_access->psz_path );

--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -296,7 +296,6 @@ static int Open( vlc_object_t *p_this )

        aout_PacketInit( p_aout, &p_aout->sys->packet, FRAME_SIZE );

-#ifndef UNDER_CE
        /* Check for hardware volume support */
        if( waveOutGetDevCaps( (UINT_PTR)p_aout->sys->h_waveout,
                               &wocaps, sizeof(wocaps) ) == MMSYSERR_NOERROR
@@ -308,7 +307,6 @@ static int Open( vlc_object_t *p_this )
            p_aout->sys->mute = false;
        }
        else
-#endif
            aout_SoftVolumeInit( p_aout );
    }

@@ -1000,7 +998,6 @@ static void* WaveOutThread( void *data )
    return NULL;
 }

-#ifndef UNDER_CE
 static int VolumeSet( audio_output_t *aout, float volume )
 {
    aout_sys_t *sys = aout->sys;
@@ -1030,7 +1027,6 @@ static int MuteSet( audio_output_t * p_aout, bool mute )
    waveOutSetVolume( hwo, vol | (vol << 16) );
    return 0;
 }
-#endif

 /*
  reload the configuration drop down list, of the Audio Devices

--- a/modules/audio_output/windows_audio_common.h
+++ b/modules/audio_output/windows_audio_common.h
@@ -71,9 +71,7 @@ typedef struct {
 } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
 #endif

-#ifndef UNDER_CE
-#   include <dsound.h>
-#endif
+#include <dsound.h>

 #ifndef SPEAKER_FRONT_LEFT
 #   define SPEAKER_FRONT_LEFT             0x1

--- a/modules/codec/mpeg_audio.c
+++ b/modules/codec/mpeg_audio.c
@@ -107,11 +107,7 @@ vlc_module_begin ()
    set_description( N_("MPEG audio layer I/II/III decoder") )
    set_category( CAT_INPUT )
    set_subcategory( SUBCAT_INPUT_ACODEC )
-#if defined(UNDER_CE)
-   set_capability( "decoder", 5 )
-#else
    set_capability( "decoder", 100 )
-#endif
    set_callbacks( OpenDecoder, CloseDecoder )

    add_submodule ()

--- a/modules/control/Modules.am
+++ b/modules/control/Modules.am
@@ -20,9 +20,7 @@ libvlc_LTLIBRARIES += \
 	libdummy_plugin.la \
 	libgestures_plugin.la \
 	libnetsync_plugin.la \
-	libhotkeys_plugin.la
-if !HAVE_WINCE
-libvlc_LTLIBRARIES += \
+	libhotkeys_plugin.la \
 	liboldrc_plugin.la
 if !HAVE_WIN32
 libvlc_LTLIBRARIES += \
@@ -30,5 +28,4 @@ libvlc_LTLIBRARIES += \
 else
 libvlc_LTLIBRARIES += \
 	libntservice_plugin.la
-endif
 endif	
--- a/modules/gui/eject.c
+++ b/modules/gui/eject.c
@@ -35,7 +35,7 @@
 #include <vlc_common.h>
 #include <vlc_fs.h>

-#if defined( WIN32 ) && !defined( UNDER_CE )
+#if defined( WIN32 )
 #   include <mmsystem.h>