* ALL: WinCE build fixes.

diff --git a/include/main.h b/include/main.h
index b93b60270792facabd488c67aae27e35c0107144..12c216b7ff597a7bdd91dc188d30a0a9e0715559 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -90,13 +90,8 @@ struct vlc_t
 
     /* Fast memcpy plugin used */
     module_t *             p_memcpy_module;
-#if defined( UNDER_CE )
-    void* ( __cdecl *pf_memcpy ) ( void *, const void *, size_t );
-    void* ( __cdecl *pf_memset ) ( void *, int, size_t );
-#else
     void* ( *pf_memcpy ) ( void *, const void *, size_t );
     void* ( *pf_memset ) ( void *, int, size_t );
-#endif
 
     /* Shared data - these structures are accessed directly from p_vlc by
      * several modules */

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 3df206b4a658a957e21c64e681a5e51f3ed380d9..724b9920b9f79c9a94ec694b394a1a52439066a4 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -3,7 +3,7 @@
  * This header provides portable declarations for mutexes & conditions
  *****************************************************************************
  * Copyright (C) 1999, 2002 VideoLAN
- * $Id: vlc_threads.h,v 1.37 2004/03/01 12:50:39 gbazin Exp $
+ * $Id$
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -146,7 +146,7 @@ typedef struct
 #elif defined( WIN32 ) || defined( UNDER_CE )
 typedef HANDLE vlc_thread_t;
 typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT) ( HANDLE, HANDLE, DWORD, BOOL );
-typedef unsigned (__stdcall *PTHREAD_START) (void *);
+typedef unsigned (WINAPI *PTHREAD_START) (void *);
 
 typedef struct
 {

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index aedd114e5625f2ecc9e442aa04b1ce85f681d9d2..cd0f7ebeefa7f02fb7d7aa160101d87db315a78b 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -47,7 +47,9 @@
 #   include <sys/stat.h>
 #endif
 
-#ifdef WIN32
+#if defined( UNDER_CE )
+#   include <winsock.h>
+#elif WIN32
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
 #   ifndef IN_MULTICAST

diff --git a/modules/codec/cmml/browser_open.c b/modules/codec/cmml/browser_open.c
index ce307c546df8029e821ee659dd6caf7dee74e3f5..8858df897bc78da5f3affe8777846b07f021077a 100644 (file)
--- a/modules/codec/cmml/browser_open.c
+++ b/modules/codec/cmml/browser_open.c
@@ -38,6 +38,10 @@ int browser_Open( const char *psz_url )
     psz_open_commandline = xstrcat( psz_open_commandline, psz_url );
 
     return system( psz_open_commandline );
+
+#elif defined( UNDER_CE )
+    return -1;
+
 #elif defined( WIN32 )
     char *psz_open_commandline;
 
@@ -45,6 +49,7 @@ int browser_Open( const char *psz_url )
     xstrcat( psz_open_commandline, psz_url );
 
     return system( psz_open_commandline );
+
 #else
     /* Assume we're on a UNIX of some sort */
     char *psz_open_commandline;
@@ -55,10 +60,7 @@ int browser_Open( const char *psz_url )
     xstrcat( psz_open_commandline, psz_url );
     i_ret = system( psz_open_commandline );
 
-    if( i_ret == 0 )
-    {
-        return 0;
-    }
+    if( i_ret == 0 ) return 0;
 
     free( psz_open_commandline );
 

diff --git a/modules/video_output/wingdi.c b/modules/video_output/wingdi.c
index 42d5c01fcc8e471050b1ba031aef9f7901200881..a4f1ad0c21fd1565e7f4784bcb14074f278c368c 100644 (file)
--- a/modules/video_output/wingdi.c
+++ b/modules/video_output/wingdi.c
@@ -31,16 +31,14 @@
 #include <vlc/vlc.h>
 #include <vlc/vout.h>
 
-#include <windows.h>
-#define WIN32_LEAN_AND_MEAN
+#include <commctrl.h>
 
 #ifdef UNDER_CE
-#   include <aygshell.h>
+#   define SHFS_HIDESIPBUTTON   0x0008
 #   define MENU_HEIGHT 26
 #else
 #   define SHFS_HIDESIPBUTTON 0
 #   define MENU_HEIGHT 0
-#   define NM_CUSTOMDRAW 0
 #endif
 
 #undef MODULE_NAME_IS_gapi

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index db8b6e6a68e0f2aa46578146b0f1fd5a9516984f..310d1de49f06a572afd7a2cc84580fa78ca4b27f 100644 (file)
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -299,6 +299,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
     for( j = -1; j == -1 || ( j >= 0 && subdirs != NULL && *subdirs != NULL );
          j++)
     {
+#ifdef HAVE_DIRENT_H
         d = opendir( j < 0 ? f_dir : *subdirs );
         if( d )
         {
@@ -377,6 +378,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
             }
             closedir( d );
         }
+#endif
         if( j >= 0 ) free( *subdirs++ );
     }
 

diff --git a/src/misc/configuration.c b/src/misc/configuration.c
index 397192e7dac66c87a8f6987f7c5078035b1e23a0..0090d5ee738d445d4ae2e769a2741b11ac84e9bd 100644 (file)
--- a/src/misc/configuration.c
+++ b/src/misc/configuration.c
@@ -1616,6 +1616,10 @@ char *config_GetHomeDir( void )
 
 #elif defined(UNDER_CE)
 
+#ifndef CSIDL_APPDATA
+#   define CSIDL_APPDATA 0x1A
+#endif
+
     wchar_t p_whomedir[MAX_PATH];
 
     /* get the "Application Data" folder for the current user */

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 99b02daa8f7599691ebe99148536e115e92a4e8d..c3f62f921decf1ac0579e93800a01906501a0282 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -115,7 +115,7 @@
 #   include "modules_plugin.h"
 #endif
 
-#if defined( UNDER_CE )
+#if defined( _MSC_VER ) && defined( UNDER_CE )
 #    include "modules_builtin_evc.h"
 #elif defined( _MSC_VER )
 #    include "modules_builtin_msvc.h"

diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index d03b5b0a7216ecf84c0c238f65e024c182a625f2..4ce7914d00fcba48e968ccc9f4ba59c485a4ee98 100644 (file)
--- a/src/misc/win32_specific.c
+++ b/src/misc/win32_specific.c
@@ -37,7 +37,7 @@
 #   include <fcntl.h>
 #endif
 
-#include <winsock2.h>
+#include <winsock.h>
 
 /*****************************************************************************
  * system_Init: initialize winsock and misc other things.
@@ -77,8 +77,8 @@ void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
     /* Set the default file-translation mode */
 #if !defined( UNDER_CE )
     _fmode = _O_BINARY;
-#endif
     _setmode( _fileno( stdin ), _O_BINARY ); /* Needed for pipes */
+#endif
 
     /* Call mdate() once to make sure it is initialized properly */
     mdate();