summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcls%seawood.org <devnull@localhost>1999-07-05 19:14:16 +0000
committercls%seawood.org <devnull@localhost>1999-07-05 19:14:16 +0000
commitde2796f78aa36336a2add419e629e3811c2732c0 (patch)
tree8bf9a33f368a48fd055f55c2457e1acf67c8afb7
parentd551013926a6d74dcd49b8751e71d9c900c8ed37 (diff)
downloadnspr-hg-de2796f78aa36336a2add419e629e3811c2732c0.tar.gz
Hit an impasse with windows x-compiling. Need a win32 guru. Cleaned up the detection of HOSTCC and handling of HOSTCFLAGS.
-rw-r--r--pr/include/prtypes.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/pr/include/prtypes.h b/pr/include/prtypes.h
index 6d728f1a..bc6ca53c 100644
--- a/pr/include/prtypes.h
+++ b/pr/include/prtypes.h
@@ -58,10 +58,18 @@
**
***********************************************************************/
#if defined(WIN32)
+
+#if defined(__MINGW32__)
+#define PR_EXTERN(__type) extern __declspec(dllexport) __type
+#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
+#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
+#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
+#else
#define PR_EXTERN(__type) extern _declspec(dllexport) __type
#define PR_IMPLEMENT(__type) _declspec(dllexport) __type
#define PR_EXTERN_DATA(__type) extern _declspec(dllexport) __type
#define PR_IMPLEMENT_DATA(__type) _declspec(dllexport) __type
+#endif
#define PR_CALLBACK
#define PR_CALLBACK_DECL
@@ -258,7 +266,7 @@ typedef unsigned long PRUint64;
#elif defined(WIN16)
typedef __int64 PRInt64;
typedef unsigned __int64 PRUint64;
-#elif defined(WIN32)
+#elif defined(WIN32) && !defined(__MINGW32__)
typedef __int64 PRInt64;
typedef unsigned __int64 PRUint64;
#else