Hit an impasse with windows x-compiling. Need a win32 guru. Cleaned up the detection of HOSTCC and handling of HOSTCFLAGS. unlabeled-3.9.24
authorcls%seawood.org
Mon, 05 Jul 1999 19:14:16 +0000
branchunlabeled-3.9.24
changeset 683 44b8c809f7e2d4ebdc15839ce904b0f435d17564
parent 578 7cd8b6583f5a8c1efec0c19366b86e0b3fbe99bc
child 711 df029012f877516c749ffe064d4a234c186bc579
push idunknown
push userunknown
push dateunknown
Hit an impasse with windows x-compiling. Need a win32 guru. Cleaned up the detection of HOSTCC and handling of HOSTCFLAGS.
pr/include/prtypes.h
--- a/pr/include/prtypes.h
+++ b/pr/include/prtypes.h
@@ -53,20 +53,28 @@
 **   in dowhim.h
 **     PR_EXTERN( void ) DoWhatIMean( void );
 **   in dowhim.c
 **     PR_IMPLEMENT( void ) DoWhatIMean( void ) { return; }
 **
 **
 ***********************************************************************/
 #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
 #define PR_STATIC_CALLBACK(__x) static __x
 
 #elif defined(XP_BEOS)
 #define PR_EXTERN(__type) extern __declspec(dllexport) __type
 #define PR_IMPLEMENT(__type) __declspec(dllexport) __type
@@ -253,17 +261,17 @@ typedef long PRInt32;
 ************************************************************************/
 #ifdef HAVE_LONG_LONG
 #if PR_BYTES_PER_LONG == 8
 typedef long PRInt64;
 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
 typedef long long PRInt64;
 typedef unsigned long long PRUint64;
 #endif /* PR_BYTES_PER_LONG == 8 */
 #else  /* !HAVE_LONG_LONG */
 typedef struct {