Mercurial > hg > nginx
changeset 6858:f39ceadf0441
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 24 Dec 2016 18:01:14 +0300 |
parents | 26d88ec9baf4 |
children | 38df52d4e250 |
files | src/os/win32/ngx_win32_config.h |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/win32/ngx_win32_config.h Sat Dec 24 18:01:14 2016 +0300 +++ b/src/os/win32/ngx_win32_config.h Sat Dec 24 18:01:14 2016 +0300 @@ -152,7 +152,7 @@ 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