* src/misc/httpd.c, modules/demux/subtitle.c, modules/gui/wince/wince_rc.rc: more...

diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index cafc285c4a84095767385560a04236c46fd6460c..d1c1fe3e0a24675fcb3da91ba57869fd3cb81a26 100644 (file)
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -37,11 +37,6 @@
 #include <vlc/input.h>
 #include "vlc_video.h"
 
-
-#if (!defined( WIN32 ) || defined(__MINGW32__))
-#    include <dirent.h>
-#endif
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

diff --git a/modules/gui/wince/wince_rc.rc b/modules/gui/wince/wince_rc.rc
index 0b7b6dfaee1538804c8b76dc3bfb27c3cb0e5489..3aa780236bd003782ef3943f035d7d8c2acc80c1 100644 (file)
--- a/modules/gui/wince/wince_rc.rc
+++ b/modules/gui/wince/wince_rc.rc
@@ -27,7 +27,7 @@
 // English (U.S.) resources\r
 \r
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
-#ifdef _WIN32\r
+#if defined(_WIN32) && !defined(_WIN32_WCE)\r
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
 #pragma code_page(1252)\r
 #endif //_WIN32\r
@@ -191,7 +191,7 @@ END
 // French (France) resources\r
 \r
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)\r
-#ifdef _WIN32\r
+#if defined(_WIN32) && !defined(_WIN32_WCE)\r
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH\r
 #pragma code_page(1252)\r
 #endif //_WIN32\r

diff --git a/src/misc/httpd.c b/src/misc/httpd.c
index 354631617657e40434ad72061544adf308ea91ba..f43a9370882ede3971e12c805ea233e794381a76 100644 (file)
--- a/src/misc/httpd.c
+++ b/src/misc/httpd.c
@@ -56,8 +56,10 @@
 #   endif
 #endif
 
-#if defined(WIN32)
+#if defined(WIN32) && !defined(UNDER_CE)
 static const struct in6_addr in6addr_any = {{IN6ADDR_ANY_INIT}};
+#elif defined(UNDER_CE) && defined(AF_INET6)
+#   undef AF_INET6
 #endif
 
 #ifndef PF_INET