X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=includes%2FStgDLL.h;h=5e824271bf415a371de7423146933cb6aca469c9;hp=ededcc96b585ecb68123240bbea70b9749630948;hb=006a18ea83799c0d4255071a2f8c08d3e9c7d84f;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1

diff --git a/includes/StgDLL.h b/includes/StgDLL.h
index ededcc9..5e82427 100644
--- a/includes/StgDLL.h
+++ b/includes/StgDLL.h
@@ -1,19 +1,19 @@
 #ifndef __STGDLL_H__
 #define __STGDLL_H__ 1
 
-#if defined(HAVE_WIN32_DLL_SUPPORT) && !defined(DONT_WANT_WIN32_DLL_SUPPORT)
-#define ENABLE_WIN32_DLL_SUPPORT
-#endif
-
-#ifdef ENABLE_WIN32_DLL_SUPPORT
-# if __GNUC__ && !defined(__declspec)
-#  define DLLIMPORT
-# else
-#  define DLLIMPORT __declspec(dllimport)
-#  define DLLIMPORT_DATA(x) _imp__##x
-# endif
+#if defined(__PIC__) && defined(mingw32_TARGET_OS)
+#  define DLL_IMPORT_DATA_REF(x) (_imp__##x)
+#  define DLL_IMPORT_DATA_VARNAME(x) *_imp__##x
+#  if __GNUC__ && !defined(__declspec)
+#    define DLLIMPORT
+#  else
+#    define DLLIMPORT __declspec(dllimport)
+#    define DLLIMPORT_DATA(x) _imp__##x
+#  endif
 #else
-# define DLLIMPORT
+#  define DLL_IMPORT_DATA_REF(x) (&(x))
+#  define DLL_IMPORT_DATA_VARNAME(x) x
+#  define DLLIMPORT
 #endif
 
 /* The view of the ghc/includes/ header files differ ever so
@@ -32,7 +32,7 @@
 #else
 #define DLL_IMPORT
 #define DLL_IMPORT_RTS DLLIMPORT
-# ifdef ENABLE_WIN32_DLL_SUPPORT
+# if defined(__PIC__) && defined(mingw32_TARGET_OS)
 #  define DLL_IMPORT_DATA_VAR(x) _imp__##x
 # else
 #  define DLL_IMPORT_DATA_VAR(x) x