# HG changeset patch # User Maxim Dounin # Date 1482591674 -10800 # Node ID f39ceadf0441854635d6f8cfbb28fa9f1e976ba7 # Parent 26d88ec9baf4baea9cc841b58ac5bf571ae46541 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. 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