]> git.kaiwu.me - nginx.git/commitdiff
Win32: minimized redefinition of intptr_t/uintptr_t.
authorMaxim Dounin <mdounin@mdounin.ru>
Sat, 24 Dec 2016 15:01:14 +0000 (18:01 +0300)
committerMaxim Dounin <mdounin@mdounin.ru>
Sat, 24 Dec 2016 15:01:14 +0000 (18:01 +0300)
These types are available with MSVC (at least since 2003, in stddef.h),
all variants of GCC (in stdint.h) and Watcom C.  We need to define them
only for Borland C.

src/os/win32/ngx_win32_config.h

index fa5aea3d2d04f9cd3d2740676306f278a7d5c749..2cb8e1988994e2f2cec4a49552ffe7b949784f93 100644 (file)
@@ -152,7 +152,7 @@ typedef unsigned short int  uint16_t;
 typedef __int64             int64_t;
 typedef unsigned __int64    uint64_t;
 
-#if !defined(__WATCOMC__) && !defined(__MINGW64_VERSION_MAJOR)
+#if __BORLANDC__
 typedef int                 intptr_t;
 typedef u_int               uintptr_t;
 #endif