X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compat%2Fcbits%2Fdirectory.c;h=51df48054618801e64882b819a6f180d028f423c;hb=8e3f4465c2a85e6328df52939c9e2429dc63aaca;hp=79d6cd4d443802a35889f1d10688f13af392d7d0;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compat/cbits/directory.c b/compat/cbits/directory.c
index 79d6cd4..51df480 100644
--- a/compat/cbits/directory.c
+++ b/compat/cbits/directory.c
@@ -21,12 +21,13 @@
  * (PATH_MAX is not defined on systems with unlimited path length,
  * e.g. the Hurd).
  */
-INLINE HsInt __compat_long_path_size() { return PATH_MAX; } 
+INLINE int __compat_long_path_size() { return PATH_MAX; } 
 #else
-INLINE HsInt __compat_long_path_size() { return 4096; }
+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 */