From 751e6a5dae33a0f54b6a96238a8938f915d7b946 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Sat, 24 Dec 2016 18:01:14 +0300 Subject: 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. --- src/os/win32/ngx_win32_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index fa5aea3d2..2cb8e1988 100644 --- 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 -- cgit