From: simonmar <unknown>
Date: Thu, 24 Mar 2005 09:27:20 +0000 (+0000)
Subject: [project @ 2005-03-24 09:27:20 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~865
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7f788ada6ceebd48d129a6a6c9375944fea83ff7;p=ghc-hetmet.git

[project @ 2005-03-24 09:27:20 by simonmar]
omit __hscore_getFolderPath if __GLASGOW_HASKELL__ < 604
---

diff --git a/ghc/lib/compat/cbits/directory.c b/ghc/lib/compat/cbits/directory.c
index 1479a25..79d6cd4 100644
--- a/ghc/lib/compat/cbits/directory.c
+++ b/ghc/lib/compat/cbits/directory.c
@@ -1,7 +1,7 @@
-#include "../../../includes/ghcconfig.h"
-
 #include "HsFFI.h"
 
+#include "../../../includes/ghcconfig.h"
+
 #if HAVE_LIMITS_H
 #include <limits.h>
 #endif
@@ -49,6 +49,7 @@ 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()
  *
@@ -91,4 +92,5 @@ __hscore_getFolderPath(HWND hwndOwner,
     return (int)funcPtr(hwndOwner,nFolder,hToken,dwFlags,pszPath);
     /* ToDo: unload the DLL on shutdown? */
 }
+#endif /* __GLASGOW_HASKELL__ < 604 */
 #endif