Changed a couple of __MINGW32__ ifdefs into __GNUC__ ones. mingw32's new runtime (19990715) has some special ifdefs in <windows.h> so include that by default rather than <windef.h> unlabeled-3.9.24
authorcls%seawood.org
Mon, 19 Jul 1999 02:50:06 +0000
branchunlabeled-3.9.24
changeset 711 df029012f877516c749ffe064d4a234c186bc579
parent 683 44b8c809f7e2d4ebdc15839ce904b0f435d17564
child 724 29598e42ae83f6db6d9d5c97fd6f74e3cdba7610
push idunknown
push userunknown
push dateunknown
bugs19990715
Changed a couple of __MINGW32__ ifdefs into __GNUC__ ones. mingw32's new runtime (19990715) has some special ifdefs in <windows.h> so include that by default rather than <windef.h>
pr/include/prtypes.h
--- a/pr/include/prtypes.h
+++ b/pr/include/prtypes.h
@@ -54,17 +54,17 @@
 **     PR_EXTERN( void ) DoWhatIMean( void );
 **   in dowhim.c
 **     PR_IMPLEMENT( void ) DoWhatIMean( void ) { return; }
 **
 **
 ***********************************************************************/
 #if defined(WIN32)
 
-#if defined(__MINGW32__)
+#if defined(__GNUC__)
 #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
@@ -261,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) && !defined(__MINGW32__)
+#elif defined(WIN32) && !defined(__GNUC__)
 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 {