diff options
| author | wtchang%redhat.com <devnull@localhost> | 2006-12-21 22:50:49 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2006-12-21 22:50:49 +0000 |
| commit | d0de1b6634b4d6a661d5be99fcf431066239df85 (patch) | |
| tree | 961902390ed8638daa8507f6f28bf8240c34d2ca | |
| parent | 6393a6cb7bfdcbda3cd0c8cf014487ee21d1f120 (diff) | |
| download | nspr-hg-d0de1b6634b4d6a661d5be99fcf431066239df85.tar.gz | |
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. r=benjamin.smedberg.
Tag: NSPR_4_6_BRANCH
| -rw-r--r-- | pr/include/obsolete/protypes.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pr/include/obsolete/protypes.h b/pr/include/obsolete/protypes.h index c2a3c9b3..4405bfce 100644 --- a/pr/include/obsolete/protypes.h +++ b/pr/include/obsolete/protypes.h @@ -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 |