From 6c40dbd27dbc5c3e9b6904eda4c9283f54374007 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Sun, 10 Feb 2019 13:16:55 +0100 Subject: [PATCH] Regroup Windows-ifdefs in command.h --- app/src/command.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/command.h b/app/src/command.h index 98b3a881..6264adf4 100644 --- a/app/src/command.h +++ b/app/src/command.h @@ -3,33 +3,33 @@ #include #include -#include -// #ifdef _WIN32 + +# include // not needed here, but must never be included AFTER windows.h +# include # define PRIexitcode "lu" +// # ifdef _WIN64 # define PRIsizet PRIu64 # else # define PRIsizet PRIu32 # endif -#else -# define PRIsizet "zu" -# define PRIexitcode "d" -#endif - -#ifdef __WINDOWS__ -# include // not needed here, but must never be included AFTER windows.h -# include # define PROCESS_NONE NULL typedef HANDLE process_t; typedef DWORD exit_code_t; + #else + # include +# define PRIsizet "zu" +# define PRIexitcode "d" # define PROCESS_NONE -1 typedef pid_t process_t; typedef int exit_code_t; + #endif + # define NO_EXIT_CODE -1 enum process_result {