X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=include%2FHsDirectory.h;h=e5c4fb39211e6c03751707196056dd9b25013e35;hb=d9957206d51d2d6e5dc5378ab6c54280af4a3cfe;hp=eded7ebe474b6166c37333d90fa34db7d6dcf02e;hpb=133214952cec403789daff11a0ad8ba038ee3291;p=haskell-directory.git

diff --git a/include/HsDirectory.h b/include/HsDirectory.h
index eded7eb..e5c4fb3 100644
--- a/include/HsDirectory.h
+++ b/include/HsDirectory.h
@@ -9,7 +9,17 @@
 #ifndef __HSDIRECTORY_H__
 #define __HSDIRECTORY_H__
 
+#ifdef __NHC__
+#include "Nhc98BaseConfig.h"
+#else
 #include "HsDirectoryConfig.h"
+#endif
+// Otherwise these clash with similar definitions from other packages:
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
 
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -63,7 +73,6 @@ INLINE HsInt __hscore_long_path_size() {
 #endif
 }
 
-#ifdef __GLASGOW_HASKELL__
 INLINE int __hscore_R_OK() { return R_OK; }
 INLINE int __hscore_W_OK() { return W_OK; }
 INLINE int __hscore_X_OK() { return X_OK; }
@@ -71,7 +80,7 @@ INLINE int __hscore_X_OK() { return X_OK; }
 INLINE mode_t __hscore_S_IRUSR() { return S_IRUSR; }
 INLINE mode_t __hscore_S_IWUSR() { return S_IWUSR; }
 INLINE mode_t __hscore_S_IXUSR() { return S_IXUSR; }
-#endif
+INLINE mode_t __hscore_S_IFDIR() { return S_IFDIR; }
 
 #if defined(__MINGW32__)