Bugzilla Bug 308331: the guard for the int32 typedef is no longer
authorwtchang%redhat.com
Thu, 15 Sep 2005 23:15:53 +0000
changeset 3463 d74ddf2de6ccb5f3a2b17165d4f385a1dd607ddb
parent 3457 7733d49bcfda93d950ef3f143bdc8332488e1e0a
child 3466 c51748bebf78fe8f845467cddcbb45df91b3963c
push idunknown
push userunknown
push dateunknown
bugs308331
Bugzilla Bug 308331: the guard for the int32 typedef is no longer necessary. Only the winsock2.h file (winsock version 2.1) in MSVC 4.2 has the int32 typedef. MinGW's winsock2.h doesn't have that typedef, and current Microsoft winsock2.h doesn't have that either. Also, on Windows, we define int32 as long, which is the same as the int32 typedef in winsock2.h v2.1. MSVC accepts such duplicated typedefs. Thanks to timeless for the research into this problem.
pr/include/obsolete/protypes.h
--- a/pr/include/obsolete/protypes.h
+++ b/pr/include/obsolete/protypes.h
@@ -147,24 +147,22 @@ typedef PRInt64 int64;
 
 /*
  * int32
  */
 
 #if !defined(XP_BEOS) && !defined(VMS) \
     && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
     && !defined(HPUX)
-#if !defined(WIN32) || !defined(_WINSOCK2API_)  /* defines its own "int32" */
 #if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO)
 typedef PRInt32 int32;
 #else
 typedef long int32;
 #endif
 #endif
-#endif
 
 /*
  * int16
  */
 
 #if !defined(XP_BEOS) && !defined(VMS) \
     && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
     && !defined(HPUX)