[nginx] Win32: minimized redefinition of intptr_t/uintptr_t.

Maxim Dounin mdounin at mdounin.ru
Sat Dec 24 16:25:45 UTC 2016


details:   http://hg.nginx.org/nginx/rev/f39ceadf0441
branches:  
changeset: 6858:f39ceadf0441
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Sat Dec 24 18:01:14 2016 +0300
description:
Win32: minimized redefinition of intptr_t/uintptr_t.

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.

diffstat:

 src/os/win32/ngx_win32_config.h |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -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


More information about the nginx-devel mailing list