diff options
author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-12-27 18:25:47 +0100 |
---|---|---|
committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-12-27 18:25:47 +0100 |
commit | 79f3537f69e125f19f59c36aa090120a63186a54 (patch) | |
tree | 2089a3b7dac990841dbc2e4d9b2f535b82dbb0af /config-msvc.h | |
parent | f2137fedb30cb87448eb03b2f288920df6187571 (diff) | |
parent | 3a2bbdb05ca6a6996e424c9fb225cb0d53804125 (diff) |
Merge tag 'upstream/2.4.0'
Upstream version 2.4.0
Diffstat (limited to 'config-msvc.h')
-rw-r--r-- | config-msvc.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config-msvc.h b/config-msvc.h index 9c8d423..3e71c85 100644 --- a/config-msvc.h +++ b/config-msvc.h @@ -118,20 +118,20 @@ #define SIGUSR2 12 #define SIGTERM 15 -typedef unsigned __int64 uint64_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int16 uint16_t; -typedef unsigned __int8 uint8_t; -typedef __int64 int64_t; -typedef __int32 int32_t; -typedef __int16 int16_t; -typedef __int8 int8_t; +typedef unsigned __int64 uint64_t; +typedef unsigned __int32 uint32_t; +typedef unsigned __int16 uint16_t; +typedef unsigned __int8 uint8_t; +typedef __int64 int64_t; +typedef __int32 int32_t; +typedef __int16 int16_t; +typedef __int8 int8_t; #ifdef HAVE_CONFIG_MSVC_LOCAL_H #include <config-msvc-local.h> #endif -// Vista and above has implementation of inet_ntop / inet_pton +/* Vista and above has implementation of inet_ntop / inet_pton */ #if _WIN32_WINNT >= _WIN32_WINNT_VISTA #define HAVE_INET_NTOP #define HAVE_INET_PTON |