From 821ec9843c32410b5088ee86ada70e61db23e119 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Fri, 16 Mar 2018 08:51:46 +0100 Subject: [PATCH] Fix win32 build The types size_t and ssize_t are defined on Windows (in MSYS2), so there is no need to typedef SIZE_T and SSIZE_T. Exit code is "unsigned long" both on Windows 32 and 64 bits. See . --- app/src/command.h | 3 +-- app/src/net.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/command.h b/app/src/command.h index ed7d5faf..24ddd21d 100644 --- a/app/src/command.h +++ b/app/src/command.h @@ -7,12 +7,11 @@ // #ifdef _WIN32 +# define PRIexitcode "lu" # ifdef _WIN64 # define PRIsizet PRIu64 -# define PRIexitcode "lu" # else # define PRIsizet PRIu32 -# define PRIexitcode "u" # endif #else # define PRIsizet "zu" diff --git a/app/src/net.h b/app/src/net.h index 52a1e9a4..d9a9269a 100644 --- a/app/src/net.h +++ b/app/src/net.h @@ -9,8 +9,6 @@ #define SHUT_RD SD_RECEIVE #define SHUT_WR SD_SEND #define SHUT_RDWR SD_BOTH - typedef SIZE_T size_t; - typedef SSIZE_T ssize_t; typedef SOCKET socket_t; #else # include