From a7b2dcf0ee052630b5469fb2dac652d307e0784c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 2 Sep 2012 12:14:28 +0300 Subject: [PATCH] Remove WinCE --- bin/Makefile.am | 5 - bin/winvlc.c | 88 ++----------- compat/fsync.c | 2 +- configure.ac | 73 +++-------- extras/package/win32/package.mak | 9 -- include/vlc_arrays.h | 2 +- include/vlc_fs.h | 14 +- include/vlc_interface.h | 2 +- include/vlc_network.h | 6 +- include/vlc_threads.h | 5 +- modules/access/directory.c | 2 +- modules/access/dv.c | 2 +- modules/access/file.c | 2 +- modules/access/mms/mmstu.c | 5 - modules/access/vdr.c | 2 +- modules/access_output/file.c | 2 - modules/audio_output/waveout.c | 4 - modules/audio_output/windows_audio_common.h | 4 +- modules/codec/mpeg_audio.c | 4 - modules/control/Modules.am | 5 +- modules/gui/eject.c | 2 +- modules/gui/skins2/src/theme_repository.cpp | 2 +- modules/lua/Modules.am | 4 - modules/stream_filter/Modules.am | 2 - modules/stream_out/rtcp.c | 3 - modules/stream_out/rtsp.c | 2 +- modules/text_renderer/Modules.am | 3 - modules/text_renderer/svg.c | 2 +- modules/video_output/caca.c | 6 +- modules/video_output/msw/common.c | 36 ------ modules/video_output/msw/common.h | 59 --------- modules/video_output/msw/events.c | 68 ---------- share/Makefile.am | 4 - share/newres.h | 4 - src/Makefile.am | 4 - src/config/help.c | 6 +- src/input/es_out_timeshift.c | 4 +- src/input/vlm.c | 8 +- src/misc/block.c | 3 - src/misc/update.c | 4 +- src/network/httpd.c | 4 +- src/network/udp.c | 6 - src/text/unicode.c | 7 +- src/text/url.c | 2 +- src/win32/dirs.c | 18 +-- src/win32/filesystem.c | 59 +-------- src/win32/plugin.c | 16 --- src/win32/specific.c | 12 +- src/win32/thread.c | 136 +------------------- 49 files changed, 74 insertions(+), 650 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index 45b5464834123..c96e81be2f37e 100644 --- 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) diff --git a/bin/winvlc.c b/bin/winvlc.c index ff50a003f58b7..1f0af41ed2bbf 100644 --- a/bin/winvlc.c +++ b/bin/winvlc.c @@ -33,23 +33,20 @@ #include #include -#if !defined(UNDER_CE) -# ifndef _WIN32_IE -# define _WIN32_IE 0x501 -# endif -# include -# include -# include -# include -# define PSAPI_VERSION 1 -# include -# define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS)1 +#ifndef _WIN32_IE +# define _WIN32_IE 0x501 +#endif +#include +#include +#include +#include +#define PSAPI_VERSION 1 +#include +#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 diff --git a/compat/fsync.c b/compat/fsync.c index e2e7b18e70611..8352d8018dd61 100644 --- 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 diff --git a/configure.ac b/configure.ac index 5e3a588a4fc2a..8169fe821e623 100644 --- 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 does not define. AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage, [AC_TRY_COMPILE( [#include - #if defined( UNDER_CE ) - # include - #elif defined( WIN32 ) + #if defined( WIN32 ) # include #else # include @@ -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 ]) -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 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 ]) diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak index a0d2edafb6c03..7bcab42298da4 100644 --- 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) {} \; diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h index c06136de984a8..b7b631051ffb6 100644 --- 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 diff --git a/include/vlc_fs.h b/include/vlc_fs.h index 669420cc7f09a..c37fa9ade9ac5 100644 --- 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 -# 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__ diff --git a/include/vlc_interface.h b/include/vlc_interface.h index cc9ac27f26eaf..fca1c9f3d049b 100644 --- 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 */ \ { \ diff --git a/include/vlc_network.h b/include/vlc_network.h index c573f72d0be45..b5dc66ef2b0c1 100644 --- 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 -# endif +# define _NO_OLDNAMES 1 +# include # include # include # define net_errno (WSAGetLastError()) diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 2a1d2559d46c5..7fcbf25064be9 100644 --- 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 /* 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; diff --git a/modules/access/directory.c b/modules/access/directory.c index 2ae9b3bf8cbb1..194439abd7802 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -40,7 +40,7 @@ #ifdef HAVE_UNISTD_H # include # include -#elif defined( WIN32 ) && !defined( UNDER_CE ) +#elif defined( WIN32 ) # include #endif diff --git a/modules/access/dv.c b/modules/access/dv.c index 67ecc30c27476..7070612738106 100644 --- a/modules/access/dv.c +++ b/modules/access/dv.c @@ -36,7 +36,7 @@ #include #ifdef HAVE_UNISTD_H # include -#elif defined( WIN32 ) && !defined( UNDER_CE ) +#elif defined( WIN32 ) # include #endif diff --git a/modules/access/file.c b/modules/access/file.c index 972e7eec03a79..ea9ddbdd2aa71 100644 --- 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); diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c index ecf32036267e3..972532babec92 100644 --- 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, diff --git a/modules/access/vdr.c b/modules/access/vdr.c index 98a4122febaed..6c6f90b652166 100644 --- 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 #ifdef HAVE_UNISTD_H # include -#elif defined( WIN32 ) && !defined( UNDER_CE ) +#elif defined( WIN32 ) # include #endif diff --git a/modules/access_output/file.c b/modules/access_output/file.c index cfa96860a9244..b45fa1b9f7e92 100644 --- 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 ); diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c index bf6a8911065f5..7c7b545878215 100644 --- 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 diff --git a/modules/audio_output/windows_audio_common.h b/modules/audio_output/windows_audio_common.h index c8589ec5ae71b..9b4794785dae9 100644 --- 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 -#endif +#include #ifndef SPEAKER_FRONT_LEFT # define SPEAKER_FRONT_LEFT 0x1 diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c index daa0bfb7cc2cd..1ec26afb914cc 100644 --- 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 () diff --git a/modules/control/Modules.am b/modules/control/Modules.am index f9bad1d7ccc0d..d0f09e9262c50 100644 --- 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 diff --git a/modules/gui/eject.c b/modules/gui/eject.c index 8e9ffb9ab3f30..80ba7f1ced306 100644 --- a/modules/gui/eject.c +++ b/modules/gui/eject.c @@ -35,7 +35,7 @@ #include #include -#if defined( WIN32 ) && !defined( UNDER_CE ) +#if defined( WIN32 ) # include #elif defined(__linux__) # include diff --git a/modules/gui/skins2/src/theme_repository.cpp b/modules/gui/skins2/src/theme_repository.cpp index 51cf89fa5d985..2f2a640566d77 100644 --- a/modules/gui/skins2/src/theme_repository.cpp +++ b/modules/gui/skins2/src/theme_repository.cpp @@ -27,7 +27,7 @@ #include "../commands/cmd_dialogs.hpp" #ifdef HAVE_UNISTD_H # include -#elif defined( WIN32 ) && !defined( UNDER_CE ) +#elif defined( WIN32 ) # include #endif diff --git a/modules/lua/Modules.am b/modules/lua/Modules.am index 157d54b48e7a9..4a4dc70be1b0d 100644 --- a/modules/lua/Modules.am +++ b/modules/lua/Modules.am @@ -38,10 +38,6 @@ SOURCES_lua = \ if HAVE_WIN32 SOURCES_lua += libs/win.c -else -if HAVE_WINCE -SOURCES_lua += libs/win.c -endif endif libvlc_LTLIBRARIES += liblua_plugin.la diff --git a/modules/stream_filter/Modules.am b/modules/stream_filter/Modules.am index 78efb7d946f21..c258add8b9d32 100644 --- a/modules/stream_filter/Modules.am +++ b/modules/stream_filter/Modules.am @@ -16,7 +16,5 @@ libvlc_LTLIBRARIES += libstream_filter_httplive_plugin.la endif if !HAVE_WIN32 -if !HAVE_WINCE libvlc_LTLIBRARIES += libdecomp_plugin.la endif -endif diff --git a/modules/stream_out/rtcp.c b/modules/stream_out/rtcp.c index 92c31549266cb..fdd04c97633c4 100644 --- a/modules/stream_out/rtcp.c +++ b/modules/stream_out/rtcp.c @@ -84,9 +84,6 @@ rtcp_sender_t *OpenRTCP (vlc_object_t *obj, int rtp_fd, int proto, /* RTP/RTCP mux: duplicate the socket */ #ifndef WIN32 fd = vlc_dup (rtp_fd); -#elif defined(UNDER_CE) - #warning Muxed RTP/RTCP unimplemented! - fd = -1; #else WSAPROTOCOL_INFO info; WSADuplicateSocket (rtp_fd, GetCurrentProcessId (), &info); diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c index a49bd8af62cd1..cece5bc85e945 100644 --- a/modules/stream_out/rtsp.c +++ b/modules/stream_out/rtsp.c @@ -422,7 +422,7 @@ static void RtspClientAlive( rtsp_session_t *session ) static int dup_socket(int oldfd) { int newfd; -#if !defined(WIN32) || defined(UNDER_CE) +#ifndef WIN32 newfd = vlc_dup(oldfd); #else WSAPROTOCOL_INFO info; diff --git a/modules/text_renderer/Modules.am b/modules/text_renderer/Modules.am index cac7a2777ef63..e7a68c1e0b0c3 100644 --- a/modules/text_renderer/Modules.am +++ b/modules/text_renderer/Modules.am @@ -5,6 +5,3 @@ SOURCES_tdummy = tdummy.c SOURCES_win32text = win32text.c libvlc_LTLIBRARIES += libtdummy_plugin.la -if HAVE_WINCE -libvlc_LTLIBRARIES += libwin32text_plugin.la -endif diff --git a/modules/text_renderer/svg.c b/modules/text_renderer/svg.c index 1f507aac7aa75..3c14955ed5d2c 100644 --- a/modules/text_renderer/svg.c +++ b/modules/text_renderer/svg.c @@ -38,7 +38,7 @@ #ifdef HAVE_UNISTD_H # include -#elif defined( WIN32 ) && !defined( UNDER_CE ) +#elif defined( WIN32 ) # include #endif diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c index a61edf85d9f33..482974ae7b7e7 100644 --- a/modules/video_output/caca.c +++ b/modules/video_output/caca.c @@ -95,7 +95,7 @@ static int Open(vlc_object_t *object) # endif #endif -#if defined(WIN32) && !defined(UNDER_CE) +#if defined(WIN32) CONSOLE_SCREEN_BUFFER_INFO csbiInfo; SMALL_RECT rect; COORD coord; @@ -216,7 +216,7 @@ static int Open(vlc_object_t *object) free(sys); } -#if defined(WIN32) && !defined(UNDER_CE) +#if defined(WIN32) FreeConsole(); #endif return VLC_EGENERIC; @@ -237,7 +237,7 @@ static void Close(vlc_object_t *object) caca_free_display(sys->dp); cucul_free_canvas(sys->cv); -#if defined(WIN32) && !defined(UNDER_CE) +#if defined(WIN32) FreeConsole(); #endif diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c index fbc8f4445f637..078892e88e3a7 100644 --- a/modules/video_output/msw/common.c +++ b/modules/video_output/msw/common.c @@ -54,22 +54,13 @@ #include "common.h" -#ifndef UNDER_CE #include -#endif - -#ifdef UNDER_CE -#include - //WINSHELLAPI BOOL WINAPI SHFullScreen(HWND hwndRequester, DWORD dwState); -#endif static void CommonChangeThumbnailClip(vout_display_t *, bool show); static int CommonControlSetFullscreen(vout_display_t *, bool is_fullscreen); -#if !defined(UNDER_CE) static void DisableScreensaver(vout_display_t *); static void RestoreScreensaver(vout_display_t *); -#endif /* */ int CommonInit(vout_display_t *vd) @@ -124,10 +115,8 @@ int CommonInit(vout_display_t *vd) } /* Why not with glwin32 */ -#if !defined(UNDER_CE) var_Create(vd, "disable-screensaver", VLC_VAR_BOOL | VLC_VAR_DOINHERIT); DisableScreensaver (vd); -#endif return VLC_SUCCESS; } @@ -143,9 +132,7 @@ void CommonClean(vout_display_t *vd) EventThreadDestroy(sys->event); } -#if !defined(UNDER_CE) RestoreScreensaver(vd); -#endif } void CommonManage(vout_display_t *vd) @@ -279,7 +266,6 @@ void AlignRect(RECT *r, int align_boundary, int align_size) /* */ static void CommonChangeThumbnailClip(vout_display_t *vd, bool show) { -#ifndef UNDER_CE vout_display_sys_t *sys = vd->sys; /* Windows 7 taskbar thumbnail code */ @@ -317,7 +303,6 @@ static void CommonChangeThumbnailClip(vout_display_t *vd, bool show) taskbl->lpVtbl->Release(taskbl); } CoUninitialize(); -#endif } /***************************************************************************** @@ -527,15 +512,6 @@ static int CommonControlSetFullscreen(vout_display_t *vd, bool is_fullscreen) SetWindowLong(hwnd, GWL_STYLE, WS_CLIPCHILDREN | WS_VISIBLE); if (sys->hparent) { -#ifdef UNDER_CE - POINT point = {0,0}; - RECT rect; - ClientToScreen(sys->hwnd, &point); - GetClientRect(sys->hwnd, &rect); - SetWindowPos(hwnd, 0, point.x, point.y, - rect.right, rect.bottom, - SWP_NOZORDER|SWP_FRAMECHANGED); -#else /* Retrieve current window position so fullscreen will happen *on the right screen */ HMONITOR hmon = MonitorFromWindow(sys->hparent, @@ -549,7 +525,6 @@ static int CommonControlSetFullscreen(vout_display_t *vd, bool is_fullscreen) mi.rcMonitor.right - mi.rcMonitor.left, mi.rcMonitor.bottom - mi.rcMonitor.top, SWP_NOZORDER|SWP_FRAMECHANGED); -#endif } else { /* Maximize non embedded window */ ShowWindow(hwnd, SW_SHOWMAXIMIZED); @@ -564,11 +539,7 @@ static int CommonControlSetFullscreen(vout_display_t *vd, bool is_fullscreen) rect.right, rect.bottom, SWP_NOZORDER|SWP_FRAMECHANGED); -#ifdef UNDER_CE - HWND topLevelParent = GetParent(sys->hparent); -#else HWND topLevelParent = GetAncestor(sys->hparent, GA_ROOT); -#endif ShowWindow(topLevelParent, SW_HIDE); } SetForegroundWindow(hwnd); @@ -586,11 +557,7 @@ static int CommonControlSetFullscreen(vout_display_t *vd, bool is_fullscreen) rect.right, rect.bottom, SWP_NOZORDER|SWP_FRAMECHANGED); -#ifdef UNDER_CE - HWND topLevelParent = GetParent(sys->hparent); -#else HWND topLevelParent = GetAncestor(sys->hparent, GA_ROOT); -#endif ShowWindow(topLevelParent, SW_SHOW); SetForegroundWindow(sys->hparent); ShowWindow(hwnd, SW_HIDE); @@ -688,7 +655,6 @@ int CommonControl(vout_display_t *vd, int query, va_list args) } } -#if !defined(UNDER_CE) static void DisableScreensaver(vout_display_t *vd) { vout_display_sys_t *sys = vd->sys; @@ -731,5 +697,3 @@ static void RestoreScreensaver(vout_display_t *vd) sys->i_spi_screensaveactive, NULL, 0); } } -#endif - diff --git a/modules/video_output/msw/common.h b/modules/video_output/msw/common.h index cfa3323769f94..90fb966aaa33e 100644 --- a/modules/video_output/msw/common.h +++ b/modules/video_output/msw/common.h @@ -93,13 +93,9 @@ struct vout_display_sys_t bool is_first_display; bool is_on_top; -#ifndef UNDER_CE - /* screensaver system settings to be restored when vout is closed */ UINT i_spi_screensaveactive; -#endif - /* Coordinates of src and dest images (used when blitting to display) */ RECT rect_src; RECT rect_src_clipped; @@ -260,58 +256,3 @@ void AlignRect(RECT *, int align_boundary, int align_size); #define DX_POSITION_CHANGE 0x1000 #define DX_WALLPAPER_CHANGE 0x2000 #define DX_DESKTOP_CHANGE 0x4000 - -/***************************************************************************** - * WinCE helpers - *****************************************************************************/ -#ifdef UNDER_CE - -#define AdjustWindowRect(a,b,c) AdjustWindowRectEx(a,b,c,0) - -#ifndef GCL_HBRBACKGROUND -# define GCL_HBRBACKGROUND (-10) -#endif - -//#define FindWindowEx(a,b,c,d) 0 - -#define GetWindowPlacement(a,b) -#define SetWindowPlacement(a,b) -/*typedef struct _WINDOWPLACEMENT { - UINT length; - UINT flags; - UINT showCmd; - POINT ptMinPosition; - POINT ptMaxPosition; - RECT rcNormalPosition; -} WINDOWPLACEMENT;*/ - -#ifndef WM_NCMOUSEMOVE -# define WM_NCMOUSEMOVE 160 -#endif -#ifndef CS_OWNDC -# define CS_OWNDC 32 -#endif -#ifndef SC_SCREENSAVE -# define SC_SCREENSAVE 0xF140 -#endif -#ifndef SC_MONITORPOWER -# define SC_MONITORPOWER 0xF170 -#endif -#ifndef WM_NCPAINT -# define WM_NCPAINT 133 -#endif -#ifndef WS_OVERLAPPEDWINDOW -# define WS_OVERLAPPEDWINDOW 0xcf0000 -#endif -#ifndef WS_EX_NOPARENTNOTIFY -# define WS_EX_NOPARENTNOTIFY 4 -#endif -#ifndef WS_EX_APPWINDOW -#define WS_EX_APPWINDOW 0x40000 -#endif - -//#define SetWindowLongPtr SetWindowLong -//#define GetWindowLongPtr GetWindowLong -//#define GWLP_USERDATA GWL_USERDATA - -#endif //UNDER_CE diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c index c1589542c300e..befe980b05278 100644 --- a/modules/video_output/msw/events.c +++ b/modules/video_output/msw/events.c @@ -56,30 +56,6 @@ #include #include "common.h" -#ifdef UNDER_CE -#include - //WINSHELLAPI BOOL WINAPI SHFullScreen(HWND hwndRequester, DWORD dwState); - -UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) -{ - MENUITEMINFO info; - memset(&info, 0, sizeof(info)); - info.cbSize = sizeof(info); - info.fMask = MIIM_STATE; - if (!GetMenuItemInfo(hMenu, id, (flags & MF_BYPOSITION) != 0, &info)) - return -1; - /* XXX Submenu handling is missing... */ - return info.fState; -} -#endif - -/*#if defined(UNDER_CE) && !defined(__PLUGIN__) --FIXME*/ -/*# define SHFS_SHOWSIPBUTTON 0x0004 -# define SHFS_HIDESIPBUTTON 0x0008 -# define MENU_HEIGHT 26 - BOOL SHFullScreen(HWND hwndRequester, DWORD dwState); -#endif*/ - /***************************************************************************** * Local prototypes. *****************************************************************************/ @@ -175,7 +151,6 @@ static void UpdateCursor( event_thread_t *p_event, bool b_show ) } } -#ifndef UNDER_CE static HCURSOR EmptyCursor( HINSTANCE instance ) { const int cw = GetSystemMetrics(SM_CXCURSOR); @@ -195,7 +170,6 @@ static HCURSOR EmptyCursor( HINSTANCE instance ) return cursor; } -#endif static void MousePressed( event_thread_t *p_event, HWND hwnd, unsigned button ) { @@ -250,10 +224,8 @@ static void *EventThread( void *p_this ) return NULL; } -#ifndef UNDER_CE /* Prevent monitor from powering off */ SetThreadExecutionState( ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED | ES_CONTINUOUS ); -#endif /* Main loop */ /* GetMessage will sleep if there's no message in the queue */ @@ -554,18 +526,14 @@ static int DirectXCreateWindow( event_thread_t *p_event ) } #endif p_event->cursor_arrow = LoadCursor(NULL, IDC_ARROW); -#ifndef UNDER_CE p_event->cursor_empty = EmptyCursor(hInstance); -#endif /* Get the Icon from the main app */ p_event->vlc_icon = NULL; -#ifndef UNDER_CE if( GetModuleFileName( NULL, vlc_path, MAX_PATH ) ) { p_event->vlc_icon = ExtractIcon( hInstance, vlc_path, 0 ); } -#endif /* Fill in the window class structure */ wc.style = CS_OWNDC|CS_DBLCLKS; /* style: dbl click */ @@ -746,9 +714,7 @@ static void DirectXCloseWindow( event_thread_t *p_event ) if( p_event->vlc_icon ) DestroyIcon( p_event->vlc_icon ); -#ifndef UNDER_CE DestroyCursor( p_event->cursor_empty ); -#endif } /***************************************************************************** @@ -787,7 +753,6 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message, } vout_display_t *vd = p_event->vd; -#ifndef UNDER_CE /* Catch the screensaver and the monitor turn-off */ if( message == WM_SYSCOMMAND && ( (wParam & 0xFFF0) == SC_SCREENSAVE || (wParam & 0xFFF0) == SC_MONITORPOWER ) ) @@ -795,7 +760,6 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message, //if( vd ) msg_Dbg( vd, "WinProc WM_SYSCOMMAND screensaver" ); return 0; /* this stops them from happening */ } -#endif #if 0 if( message == WM_SETCURSOR ) { @@ -908,44 +872,12 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message, case WM_KILLFOCUS: #ifdef MODULE_NAME_IS_wingapi GXSuspend(); -#endif -#ifdef UNDER_CE - if( hwnd == p_event->hfswnd ) - { - HWND htbar = FindWindow( _T("HHTaskbar"), NULL ); - ShowWindow( htbar, SW_SHOW ); - } - - if( !p_event->hparent || - hwnd == p_event->hfswnd ) - { - SHFullScreen( hwnd, SHFS_SHOWSIPBUTTON ); - } #endif return 0; case WM_SETFOCUS: #ifdef MODULE_NAME_IS_wingapi GXResume(); -#endif -#ifdef UNDER_CE - /* FIXME vd->cfg is not lock[ed/able] */ -#warning "FIXME: race condition" - if( p_event->hparent && - hwnd != p_event->hfswnd && vd->cfg->is_fullscreen ) - vout_display_SendEventFullscreen(vd, false); - - if( hwnd == p_event->hfswnd ) - { - HWND htbar = FindWindow( _T("HHTaskbar"), NULL ); - ShowWindow( htbar, SW_HIDE ); - } - - if( !p_event->hparent || - hwnd == p_event->hfswnd ) - { - SHFullScreen( hwnd, SHFS_HIDESIPBUTTON ); - } #endif return 0; diff --git a/share/Makefile.am b/share/Makefile.am index c923bb48ff977..0c6b76f4eb8bd 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -4,10 +4,8 @@ EXTRA_DIST = appdatadir = $(datadir)/applications if !HAVE_WIN32 -if !HAVE_WINCE appdata_DATA = vlc.desktop endif -endif EXTRA_DIST += vlc.desktop.in CLEANFILES += $(appdata_DATA) @@ -24,7 +22,6 @@ icons128dir = $(iconsdatadir)/128x128/apps icons256dir = $(iconsdatadir)/256x256/apps if !HAVE_WIN32 -if !HAVE_WINCE dist_vlcdata_DATA = icons/vlc.ico dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \ @@ -39,7 +36,6 @@ nobase_dist_vlcdata_SCRIPTS = \ utils/video-vlc-default.sh \ $(NULL) endif -endif EXTRA_DIST += \ $(skins2_default_vlt_FILES) \ diff --git a/share/newres.h b/share/newres.h index f46067f469ffd..a80948a1129a3 100644 --- a/share/newres.h +++ b/share/newres.h @@ -1,10 +1,6 @@ #ifndef __NEWRES_H__ #define __NEWRES_H__ -#if !defined(UNDER_CE) - #define UNDER_CE _WIN32_WCE -#endif - #if defined(_WIN32_WCE) #if !defined(WCEOLE_ENABLE_DIALOGEX) #define DIALOGEX DIALOG DISCARDABLE diff --git a/src/Makefile.am b/src/Makefile.am index ff25cff705427..afb35ada900de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -212,9 +212,6 @@ else if HAVE_WIN32 libvlccore_la_SOURCES += $(SOURCES_libvlc_win32) else -if HAVE_WINCE -libvlccore_la_SOURCES += $(SOURCES_libvlc_win32) -else if HAVE_SYMBIAN #libvlccore_la_SOURCES += $(SOURCES_libvlc_symbian) else @@ -227,7 +224,6 @@ endif endif endif endif -endif if BUILD_HTTPD libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd) endif diff --git a/src/config/help.c b/src/config/help.c index 2f0607dd3c44a..89c5b8dbf6e6b 100644 --- a/src/config/help.c +++ b/src/config/help.c @@ -34,7 +34,7 @@ #include "config/configuration.h" #include "libvlc.h" -#if defined( WIN32 ) && !defined( UNDER_CE ) +#if defined( WIN32 ) static void ShowConsole (void); static void PauseConsole (void); #else @@ -797,7 +797,7 @@ static void Version( void ) PauseConsole(); } -#if defined (WIN32) && !defined (UNDER_CE) +#if defined (WIN32) /***************************************************************************** * ShowConsole: On Win32, create an output console for debug messages ***************************************************************************** @@ -862,7 +862,7 @@ static int ConsoleWidth( void ) i_width = 80; pclose( file ); } -#elif !defined (UNDER_CE) +#else CONSOLE_SCREEN_BUFFER_INFO buf; if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &buf)) diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c index 9a8b82d3be79d..4f5db4fbd6eb4 100644 --- a/src/input/es_out_timeshift.c +++ b/src/input/es_out_timeshift.c @@ -31,7 +31,7 @@ #include #include #include -#if defined (WIN32) && !defined (UNDER_CE) +#if defined (WIN32) # include #endif #include @@ -1552,7 +1552,7 @@ static char *GetTmpPath( char *psz_path ) free( psz_path ); /* Create a suitable path */ -#if defined (WIN32) && !defined (UNDER_CE) +#if defined (WIN32) const DWORD dwCount = GetTempPathW( 0, NULL ); wchar_t *psw_path = calloc( dwCount + 1, sizeof(wchar_t) ); if( psw_path ) diff --git a/src/input/vlm.c b/src/input/vlm.c index 0b811507ec483..15d2e245417fd 100644 --- a/src/input/vlm.c +++ b/src/input/vlm.c @@ -43,12 +43,8 @@ # include /* gettimeofday() */ #endif -#ifdef UNDER_CE -#include /* gettimeofday() */ -#endif - #include /* ctime() */ -#if defined (WIN32) && !defined (UNDER_CE) +#if defined (WIN32) #include /* ftime() */ #endif #include @@ -276,7 +272,7 @@ int vlm_ExecuteCommand( vlm_t *p_vlm, const char *psz_command, int64_t vlm_Date(void) { -#if defined (WIN32) && !defined (UNDER_CE) +#if defined (WIN32) struct timeb tm; ftime( &tm ); return ((int64_t)tm.time) * 1000000 + ((int64_t)tm.millitm) * 1000; diff --git a/src/misc/block.c b/src/misc/block.c index f99c2a24616ff..1962ff5eb98a4 100644 --- a/src/misc/block.c +++ b/src/misc/block.c @@ -338,9 +338,6 @@ block_t *block_mmap_Alloc (void *addr, size_t length) #ifdef WIN32 # include -# ifdef UNDER_CE -# define _get_osfhandle(a) ((long) (a)) -# endif static ssize_t pread (int fd, void *buf, size_t count, off_t offset) diff --git a/src/misc/update.c b/src/misc/update.c index 6afea64fdd659..c4fde538cf60b 100644 --- a/src/misc/update.c +++ b/src/misc/update.c @@ -74,9 +74,7 @@ * Remaining text is a required description of the update */ -#if defined( UNDER_CE ) -# define UPDATE_OS_SUFFIX "-ce" -#elif defined( WIN64 ) +#if defined( WIN64 ) # define UPDATE_OS_SUFFIX "-win-x64" #elif defined( WIN32 ) # define UPDATE_OS_SUFFIX "-win-x86" diff --git a/src/network/httpd.c b/src/network/httpd.c index 62384a14aa067..043e28ba5d496 100644 --- a/src/network/httpd.c +++ b/src/network/httpd.c @@ -52,9 +52,7 @@ # include #endif -#if defined( UNDER_CE ) -# include -#elif defined( WIN32 ) +#if defined( WIN32 ) # include #else # include diff --git a/src/network/udp.c b/src/network/udp.c index d8dc9d59ce5dd..6763f10a399c4 100644 --- a/src/network/udp.c +++ b/src/network/udp.c @@ -39,12 +39,6 @@ #include #ifdef WIN32 -# if defined(UNDER_CE) -# undef IP_MULTICAST_TTL -# define IP_MULTICAST_TTL 3 -# undef IP_ADD_MEMBERSHIP -# define IP_ADD_MEMBERSHIP 5 -# endif # define EAFNOSUPPORT WSAEAFNOSUPPORT #else # include diff --git a/src/text/unicode.c b/src/text/unicode.c index 23e41c51d37d2..9bf5716a29bbc 100644 --- a/src/text/unicode.c +++ b/src/text/unicode.c @@ -39,9 +39,7 @@ #include #include #include -#ifdef UNDER_CE -# include -#elif defined(WIN32) +#if defined(WIN32) # include #endif #include @@ -61,7 +59,6 @@ int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap ) if (unlikely(res == -1)) return -1; -# ifndef UNDER_CE /* Writing to the console is a lot of fun on Microsoft Windows. * If you use the standard I/O functions, you must use the OEM code page, * which is different from the usual ANSI code page. Or maybe not, if the @@ -82,7 +79,7 @@ int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap ) goto out; } } -# endif + char *ansi = ToANSI (str); if (ansi != NULL) { diff --git a/src/text/url.c b/src/text/url.c index 42473ff54b2e8..9954bd8a33854 100644 --- a/src/text/url.c +++ b/src/text/url.c @@ -307,7 +307,7 @@ char *make_path (const char *url) if (schemelen == 4 && !strncasecmp (url, "file", 4)) { -#if (!defined (WIN32) && !defined (__OS2__)) || defined (UNDER_CE) +#if !defined (WIN32) && !defined (__OS2__) /* Leading slash => local path */ if (*path == '/') return path; diff --git a/src/win32/dirs.c b/src/win32/dirs.c index 04e5bb7cc468e..b49b0e0f045a2 100644 --- a/src/win32/dirs.c +++ b/src/win32/dirs.c @@ -29,9 +29,7 @@ #include #include -#ifndef UNDER_CE -# include -#endif +#include #include #include "../libvlc.h" @@ -78,16 +76,9 @@ const char *config_GetConfDir (void) if (*appdir) return appdir; -#if defined (UNDER_CE) - /*There are some errors in cegcc headers*/ -#undef SHGetSpecialFolderPath - BOOL WINAPI SHGetSpecialFolderPath(HWND,LPWSTR,int,BOOL); - if( SHGetSpecialFolderPath( NULL, wdir, CSIDL_APPDATA, 1 ) ) -#else /* Get the "Application Data" folder for all users */ if( S_OK == SHGetFolderPathW( NULL, CSIDL_COMMON_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, wdir ) ) -#endif { WideCharToMultiByte (CP_UTF8, 0, wdir, -1, appdir, PATH_MAX, NULL, NULL); @@ -100,15 +91,8 @@ static char *config_GetShellDir (int csidl) { wchar_t wdir[MAX_PATH]; -#if defined (UNDER_CE) - /*There are some errors in cegcc headers*/ -#undef SHGetSpecialFolderPath - BOOL WINAPI SHGetSpecialFolderPath(HWND,LPWSTR,int,BOOL); - if (SHGetSpecialFolderPath (NULL, wdir, CSIDL_APPDATA, 1)) -#else if (SHGetFolderPathW (NULL, csidl | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, wdir ) == S_OK) -#endif return FromWide (wdir); return NULL; } diff --git a/src/win32/filesystem.c b/src/win32/filesystem.c index 540cf7bfd2363..ddeb704e8ad48 100644 --- a/src/win32/filesystem.c +++ b/src/win32/filesystem.c @@ -37,11 +37,7 @@ #include #include #include -#ifndef UNDER_CE -# include -#else -# include -#endif +#include #include #include @@ -82,10 +78,6 @@ int vlc_open (const char *filename, int flags, ...) if ((flags & O_TEXT) == 0) flags |= O_BINARY; -#ifdef UNDER_CE - /*_open translates to wchar internally on WinCE*/ - return _open (filename, flags, mode); -#else /* * open() cannot open files with non-“ANSI” characters on Windows. * We use _wopen() instead. Same thing for mkdir() and stat(). @@ -97,7 +89,6 @@ int vlc_open (const char *filename, int flags, ...) int fd = _wopen (wpath, flags, mode); free (wpath); return fd; -#endif } int vlc_openat (int dir, const char *filename, int flags, ...) @@ -109,11 +100,6 @@ int vlc_openat (int dir, const char *filename, int flags, ...) int vlc_mkdir( const char *dirname, mode_t mode ) { -#if defined (UNDER_CE) - (void) mode; - /* mkdir converts internally to wchar */ - return _mkdir(dirname); -#else wchar_t *wpath = widen_path (dirname); if (wpath == NULL) return -1; @@ -122,12 +108,10 @@ int vlc_mkdir( const char *dirname, mode_t mode ) free (wpath); (void) mode; return ret; -#endif } char *vlc_getcwd (void) { -#ifndef UNDER_CE wchar_t *wdir = _wgetcwd (NULL, 0); if (wdir == NULL) return NULL; @@ -135,9 +119,6 @@ char *vlc_getcwd (void) char *dir = FromWide (wdir); free (wdir); return dir; -#else - return NULL; -#endif } /* Under Windows, these wrappers return the list of drive letters @@ -171,11 +152,7 @@ DIR *vlc_opendir (const char *dirname) free (wpath); /* Special mode to list drive letters */ p_dir->wdir = NULL; -#ifdef UNDER_CE - p_dir->u.drives = 1; -#else p_dir->u.drives = GetLogicalDrives (); -#endif return (void *)p_dir; } @@ -203,10 +180,7 @@ char *vlc_readdir (DIR *dir) DWORD drives = p_dir->u.drives; if (drives == 0) return NULL; /* end */ -#ifdef UNDER_CE - p_dir->u.drives = 0; - return strdup ("\\"); -#else + unsigned int i; for (i = 0; !(drives & 1); i++) drives >>= 1; @@ -217,7 +191,6 @@ char *vlc_readdir (DIR *dir) if (asprintf (&ret, "%c:\\", 'A' + i) == -1) return NULL; return ret; -#endif } if (p_dir->u.insert_dot_dot) @@ -235,10 +208,6 @@ char *vlc_readdir (DIR *dir) int vlc_stat (const char *filename, struct stat *buf) { -#ifdef UNDER_CE - /* _stat translates to wchar internally on WinCE */ - return _stat (filename, buf); -#else wchar_t *wpath = widen_path (filename); if (wpath == NULL) return -1; @@ -249,7 +218,6 @@ int vlc_stat (const char *filename, struct stat *buf) int ret = _wstati64 (wpath, buf); free (wpath); return ret; -#endif } int vlc_lstat (const char *filename, struct stat *buf) @@ -259,10 +227,6 @@ int vlc_lstat (const char *filename, struct stat *buf) int vlc_unlink (const char *filename) { -#ifdef UNDER_CE - /*_open translates to wchar internally on WinCE*/ - return _unlink( filename ); -#else wchar_t *wpath = widen_path (filename); if (wpath == NULL) return -1; @@ -270,7 +234,6 @@ int vlc_unlink (const char *filename) int ret = _wunlink (wpath); free (wpath); return ret; -#endif } int vlc_rename (const char *oldpath, const char *newpath) @@ -281,11 +244,6 @@ int vlc_rename (const char *oldpath, const char *newpath) if (wold == NULL || wnew == NULL) goto out; -# ifdef UNDER_CE - /* FIXME: errno support */ - if (MoveFileW (wold, wnew)) - ret = 0; -#else if (_wrename (wold, wnew) && (errno == EACCES || errno == EEXIST)) { /* Windows does not allow atomic file replacement */ if (_wremove (wnew)) @@ -297,7 +255,6 @@ int vlc_rename (const char *oldpath, const char *newpath) goto out; } ret = 0; -#endif out: free (wnew); free (wold); @@ -306,24 +263,12 @@ int vlc_rename (const char *oldpath, const char *newpath) int vlc_dup (int oldfd) { -#ifdef UNDER_CE - (void) oldfd; - errno = ENOSYS; - return -1; -#else return dup (oldfd); -#endif } int vlc_pipe (int fds[2]) { -#ifdef UNDER_CE - (void) fds; - errno = ENOSYS; - return -1; -#else return _pipe (fds, 32768, O_BINARY); -#endif } #include diff --git a/src/win32/plugin.c b/src/win32/plugin.c index e617bd87bb302..a21d5ec522935 100644 --- a/src/win32/plugin.c +++ b/src/win32/plugin.c @@ -58,17 +58,13 @@ int module_Load( vlc_object_t *p_this, const char *psz_file, return -1; module_handle_t handle; -#ifndef UNDER_CE /* FIXME: this is not thread-safe -- Courmisch */ UINT mode = SetErrorMode (SEM_FAILCRITICALERRORS); SetErrorMode (mode|SEM_FAILCRITICALERRORS); -#endif handle = LoadLibraryW (wfile); -#ifndef UNDER_CE SetErrorMode (mode); -#endif free (wfile); if( handle == NULL ) @@ -91,17 +87,5 @@ void module_Unload( module_handle_t handle ) void *module_Lookup( module_handle_t handle, const char *psz_function ) { -#ifdef UNDER_CE - wchar_t wide[strlen( psz_function ) + 1]; - size_t i = 0; - do - wide[i] = psz_function[i]; /* UTF-16 <- ASCII */ - while( psz_function[i++] ); - - return (void *)GetProcAddress( handle, wide ); - -#else return (void *)GetProcAddress( handle, (char *)psz_function ); - -#endif } diff --git a/src/win32/specific.c b/src/win32/specific.c index ce8c78072f3a7..2ec409c9f9fdb 100644 --- a/src/win32/specific.c +++ b/src/win32/specific.c @@ -33,10 +33,7 @@ #include "../config/vlc_getopt.h" -#if !defined( UNDER_CE ) -# include -#endif - +#include #include @@ -59,9 +56,7 @@ static int system_InitWSA(int hi, int lo) */ void system_Init(void) { -#if !defined( UNDER_CE ) timeBeginPeriod(5); -#endif if (system_InitWSA(2, 2) && system_InitWSA(1, 1)) fputs("Error: cannot initialize Winsocks\n", stderr); @@ -85,7 +80,6 @@ typedef struct void system_Configure( libvlc_int_t *p_this, int i_argc, const char *const ppsz_argv[] ) { -#if !defined( UNDER_CE ) /* Raise default priority of the current process */ #ifndef ABOVE_NORMAL_PRIORITY_CLASS # define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000 @@ -212,8 +206,6 @@ void system_Configure( libvlc_int_t *p_this, int i_argc, const char *const ppsz_ exit( 0 ); } } - -#endif } static unsigned __stdcall IPCHelperThread( void *data ) @@ -340,9 +332,7 @@ void system_End(void) p_helper = NULL; } -#if !defined( UNDER_CE ) timeEndPeriod(5); -#endif /* XXX: In theory, we should not call this if WSAStartup() failed. */ WSACleanup(); diff --git a/src/win32/thread.c b/src/win32/thread.c index bb5d242cb6329..c8499f0ea8c96 100644 --- a/src/win32/thread.c +++ b/src/win32/thread.c @@ -36,9 +36,6 @@ #include #include #include -#ifdef UNDER_CE -# include -#endif static vlc_threadvar_t thread_key; @@ -48,9 +45,6 @@ static vlc_threadvar_t thread_key; struct vlc_thread { HANDLE id; -#ifdef UNDER_CE - HANDLE cancel_event; -#endif bool detached; bool killable; @@ -107,31 +101,6 @@ static DWORD vlc_WaitForMultipleObjects (DWORD count, const HANDLE *handles, DWORD delay) { DWORD ret; -#ifdef UNDER_CE - HANDLE buf[count + 1]; - - struct vlc_thread *th = vlc_threadvar_get (thread_key); - if (th != NULL) - { - memcpy (buf, handles, count * sizeof(HANDLE)); - buf[count++] = th->cancel_event; - handles = buf; - } - - if (count == 0) - { - Sleep (delay); - ret = WAIT_TIMEOUT; - } - else - ret = WaitForMultipleObjects (count, handles, FALSE, delay); - - if ((th != NULL) && (ret == WAIT_OBJECT_0 + count - 1)) - { - vlc_cancel_self ((uintptr_t)th); - ret = WAIT_IO_COMPLETION; - } -#else if (count == 0) { ret = SleepEx (delay, TRUE); @@ -140,7 +109,7 @@ static DWORD vlc_WaitForMultipleObjects (DWORD count, const HANDLE *handles, } else ret = WaitForMultipleObjectsEx (count, handles, FALSE, delay, TRUE); -#endif + /* We do not abandon objects... this would be a bug */ assert (ret < WAIT_ABANDONED_0 || WAIT_ABANDONED_0 + count - 1 < ret); @@ -558,9 +527,6 @@ static void vlc_thread_cleanup (struct vlc_thread *th) if (th->detached) { CloseHandle (th->id); -#ifdef UNDER_CE - CloseHandle (th->cancel_event); -#endif free (th); } } @@ -590,7 +556,6 @@ static int vlc_clone_attr (vlc_thread_t *p_handle, bool detached, th->cleaners = NULL; HANDLE hThread; -#ifndef UNDER_CE /* When using the MSVCRT C library you have to use the _beginthreadex * function instead of CreateThread, otherwise you'll end up with * memory leaks and the signal functions not working (see Microsoft @@ -606,26 +571,6 @@ static int vlc_clone_attr (vlc_thread_t *p_handle, bool detached, } hThread = (HANDLE)h; -#else - th->cancel_event = CreateEvent (NULL, FALSE, FALSE, NULL); - if (th->cancel_event == NULL) - { - free (th); - return ENOMEM; - } - - /* Not sure if CREATE_SUSPENDED + ResumeThread() is any useful on WinCE. - * Thread handles act up, too. */ - hThread = CreateThread (NULL, 128*1024, vlc_entry, th, - CREATE_SUSPENDED, NULL); - if (hThread == NULL) - { - CloseHandle (th->cancel_event); - free (th); - return ENOMEM; - } - -#endif /* Thread is suspended, so we can safely set th->id */ th->id = hThread; if (p_handle != NULL) @@ -655,9 +600,6 @@ void vlc_join (vlc_thread_t th, void **result) if (result != NULL) *result = th->data; CloseHandle (th->id); -#ifdef UNDER_CE - CloseHandle (th->cancel_event); -#endif free (th); } @@ -691,11 +633,7 @@ static void CALLBACK vlc_cancel_self (ULONG_PTR self) void vlc_cancel (vlc_thread_t th) { -#ifndef UNDER_CE QueueUserAPC (vlc_cancel_self, th->id, (uintptr_t)th); -#else - SetEvent (th->cancel_event); -#endif } int vlc_savecancel (void) @@ -734,11 +672,7 @@ void vlc_testcancel (void) th->data = NULL; /* TODO: special value? */ vlc_thread_cleanup (th); -#ifndef UNDER_CE _endthreadex(0); -#else - ExitThread(0); -#endif } } @@ -824,17 +758,11 @@ void msleep (mtime_t delay) /*** Timers ***/ struct vlc_timer { -#ifndef UNDER_CE HANDLE handle; -#else - unsigned id; - unsigned interval; -#endif void (*func) (void *); void *data; }; -#ifndef UNDER_CE static void CALLBACK vlc_timer_do (void *val, BOOLEAN timeout) { struct vlc_timer *timer = val; @@ -842,26 +770,6 @@ static void CALLBACK vlc_timer_do (void *val, BOOLEAN timeout) assert (timeout); timer->func (timer->data); } -#else -static void CALLBACK vlc_timer_do (unsigned timer_id, unsigned msg, - DWORD_PTR user, DWORD_PTR unused1, - DWORD_PTR unused2) -{ - struct vlc_timer *timer = (struct vlc_timer *) user; - assert (timer_id == timer->id); - (void) msg; - (void) unused1; - (void) unused2; - - timer->func (timer->data); - - if (timer->interval) - { - mtime_t interval = timer->interval * 1000; - vlc_timer_schedule (timer, false, interval, interval); - } -} -#endif int vlc_timer_create (vlc_timer_t *id, void (*func) (void *), void *data) { @@ -871,46 +779,26 @@ int vlc_timer_create (vlc_timer_t *id, void (*func) (void *), void *data) return ENOMEM; timer->func = func; timer->data = data; -#ifndef UNDER_CE timer->handle = INVALID_HANDLE_VALUE; -#else - timer->id = 0; - timer->interval = 0; -#endif *id = timer; return 0; } void vlc_timer_destroy (vlc_timer_t timer) { -#ifndef UNDER_CE if (timer->handle != INVALID_HANDLE_VALUE) DeleteTimerQueueTimer (NULL, timer->handle, INVALID_HANDLE_VALUE); -#else - if (timer->id) - timeKillEvent (timer->id); - /* FIXME: timers that have not yet completed will trigger use-after-free */ -#endif free (timer); } void vlc_timer_schedule (vlc_timer_t timer, bool absolute, mtime_t value, mtime_t interval) { -#ifndef UNDER_CE if (timer->handle != INVALID_HANDLE_VALUE) { DeleteTimerQueueTimer (NULL, timer->handle, NULL); timer->handle = INVALID_HANDLE_VALUE; } -#else - if (timer->id) - { - timeKillEvent (timer->id); - timer->id = 0; - timer->interval = 0; - } -#endif if (value == 0) return; /* Disarm */ @@ -919,28 +807,8 @@ void vlc_timer_schedule (vlc_timer_t timer, bool absolute, value = (value + 999) / 1000; interval = (interval + 999) / 1000; -#ifndef UNDER_CE if (!CreateTimerQueueTimer (&timer->handle, NULL, vlc_timer_do, timer, value, interval, WT_EXECUTEDEFAULT)) -#else - TIMECAPS caps; - timeGetDevCaps (&caps, sizeof(caps)); - - unsigned delay = value; - delay = __MAX(delay, caps.wPeriodMin); - delay = __MIN(delay, caps.wPeriodMax); - - unsigned event = TIME_ONESHOT; - - if (interval == delay) - event = TIME_PERIODIC; - else if (interval) - timer->interval = interval; - - timer->id = timeSetEvent (delay, delay / 20, vlc_timer_do, (DWORD) timer, - event); - if (!timer->id) -#endif abort (); } @@ -954,12 +822,10 @@ unsigned vlc_timer_getoverrun (vlc_timer_t timer) /*** CPU ***/ unsigned vlc_GetCPUCount (void) { -#ifndef UNDER_CE DWORD_PTR process; DWORD_PTR system; if (GetProcessAffinityMask (GetCurrentProcess(), &process, &system)) return popcount (system); -#endif return 1; }