diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2007-02-05 16:02:29 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2007-02-05 16:02:29 +0000 |
| commit | a437c9add13543a5cad7e72df52bd233b6509401 (patch) | |
| tree | e537150aa09127335fde8df1364ffd5ee04a7477 /compat | |
| parent | 14df4276ef4480afd6f911f90f587257019bf4bc (diff) | |
| download | haskell-a437c9add13543a5cad7e72df52bd233b6509401.tar.gz | |
Move #ifdef __GLASGOW_HASKELL__ < 604 to cover the CSIDL definitions too
Fixes bug exposed by compiling base w/ -fasm on Windows
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/cbits/directory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compat/cbits/directory.c b/compat/cbits/directory.c index 456f612866..51df480546 100644 --- a/compat/cbits/directory.c +++ b/compat/cbits/directory.c @@ -27,6 +27,7 @@ INLINE int __compat_long_path_size() { return 4096; } #endif #if defined(mingw32_HOST_OS) +#if __GLASGOW_HASKELL__ < 604 /* Make sure we've got the reqd CSIDL_ constants in scope; * w32api header files are lagging a bit in defining the full set. @@ -49,7 +50,6 @@ INLINE int __hscore_CSIDL_APPDATA() { return CSIDL_APPDATA; } INLINE int __hscore_CSIDL_WINDOWS() { return CSIDL_WINDOWS; } INLINE int __hscore_CSIDL_PERSONAL() { return CSIDL_PERSONAL; } -#if __GLASGOW_HASKELL__ < 604 /* * Function: __hscore_getFolderPath() * @@ -93,4 +93,4 @@ __hscore_getFolderPath(HWND hwndOwner, /* ToDo: unload the DLL on shutdown? */ } #endif /* __GLASGOW_HASKELL__ < 604 */ -#endif +#endif /* mingw32_HOST_OS */ |