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.
This commit is contained in:
wtchang%redhat.com 2005-09-15 23:15:53 +00:00
parent 56c732047e
commit 6a0ea90a7b

View File

@ -152,14 +152,12 @@ typedef PRInt64 int64;
#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