Generalised WinCE fix for other platforms

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 9250d85d90faa77a2d370ff61e864088d80cc42d..afc6b6705e32ada508bb499701f8f8d244e4ec4c 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -79,6 +79,9 @@
     #if defined __MWERKS__ || defined __CYGWIN__
         #include <io.h>
     #endif
+    #if defined __WINE__
+    extern "C" { long _get_osfhandle(int); }
+    #endif
 #endif // __WINDOWS__
 
 #if defined(__VMS__)
@@ -189,8 +192,8 @@ void wxPathList::AddEnvList (const wxString& envVariable)
         wxT(" :;");
 #endif
 
-    wxChar *val = wxGetenv (WXSTRINGCAST envVariable);
-    if (val && *val)
+    wxString val ;    
+    if (wxGetEnv (WXSTRINGCAST envVariable, &val))
     {
         wxChar *s = MYcopystring (val);
         wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);