Add makeRelativeToCurrentDirectory

[haskell-directory.git] / include / HsDirectory.h

diff --git a/include/HsDirectory.h b/include/HsDirectory.h
index 75c71c9..7185dc8 100644 (file)
--- 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,