X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=include%2FHsDirectory.h;h=7f33f08cfe74fead33e4a293f4350ebe18777e39;hb=e6e0fcd70d76aecbbbb73bebd1dd18ca6545d667;hp=75c71c9761b49ab8ccee029fa9c7dac5f6af2dc4;hpb=37bee7fd400d0abc6a460aaef03adc36583abe8f;p=haskell-directory.git

diff --git a/include/HsDirectory.h b/include/HsDirectory.h
index 75c71c9..7f33f08 100644
--- a/include/HsDirectory.h
+++ b/include/HsDirectory.h
@@ -10,6 +10,12 @@
 #define __HSDIRECTORY_H__
 
 #include "HsDirectoryConfig.h"
+// 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>
@@ -23,6 +29,10 @@
 
 #include "HsFFI.h"
 
+#if defined(__MINGW32__)
+#include <shlobj.h>
+#endif
+
 #if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
 extern int __hscore_getFolderPath(HWND hwndOwner,
                   int nFolder,
@@ -67,6 +77,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; }
+INLINE mode_t __hscore_S_IFDIR() { return S_IFDIR; }
 #endif
 
 #if defined(__MINGW32__)