comparison host/tools/configtool/standalone/wxwin/filename.cpp @ 768:261830f283c6

* Merge patches to build configtool against wxWindows 2.4.0 using Cygwin GCC from the trunk.
author jld
date Thu, 20 Mar 2003 09:44:44 +0000
parents 4fbd36edba7c
children
comparison
equal deleted inserted replaced
767:c043b17d4bec 768:261830f283c6
46 46
47 #include <windows.h> 47 #include <windows.h>
48 #include <shlwapi.h> 48 #include <shlwapi.h>
49 49
50 #include "wx/msw/winundef.h" 50 #include "wx/msw/winundef.h"
51 #ifndef __CYGWIN__
52 #ifdef CreateDirectory 51 #ifdef CreateDirectory
53 #undef CreateDirectory 52 #undef CreateDirectory
54 #endif 53 #endif
55 #ifdef ExpandEnvironmentStrings 54 #ifdef ExpandEnvironmentStrings
56 #undef ExpandEnvironmentStrings 55 #undef ExpandEnvironmentStrings
61 #ifdef SetCurrentDirectory 60 #ifdef SetCurrentDirectory
62 #undef SetCurrentDirectory 61 #undef SetCurrentDirectory
63 #endif 62 #endif
64 #ifdef GetTempPath 63 #ifdef GetTempPath
65 #undef GetTempPath 64 #undef GetTempPath
66 #endif
67 #endif 65 #endif
68 66
69 #else 67 #else
70 68
71 // #include <dir.h> 69 // #include <dir.h>