Merge commit 'origin/1.0-bugfix'

[vlc] / src / config / dirs.c

diff --git a/src/config/dirs.c b/src/config/dirs.c
index 16cbf8134c85f4f26b506be6a3e741ff7da7d862..deb789ecee10a7faea920a2b1f0fa673736cb695 100644 (file)
--- a/src/config/dirs.c
+++ b/src/config/dirs.c
@@ -30,7 +30,9 @@
 #if defined( WIN32 )
 # define _WIN32_IE IE5
 # include <w32api.h>
+#ifndef UNDER_CE
 # include <direct.h>
+#endif
 # include <shlobj.h>
 #else
 # include <unistd.h>
@@ -82,6 +84,9 @@ static const char *GetDir( bool b_appdata, bool b_common_appdata )
     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
     /* Get the "Application Data" folder for the current user */