From a437c9add13543a5cad7e72df52bd233b6509401 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 5 Feb 2007 16:02:29 +0000 Subject: [PATCH] Move #ifdef __GLASGOW_HASKELL__ < 604 to cover the CSIDL definitions too Fixes bug exposed by compiling base w/ -fasm on Windows --- compat/cbits/directory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compat/cbits/directory.c b/compat/cbits/directory.c index 456f612..51df480 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 */ -- 1.7.10.4