commit dc62ba65479774fba313119fa1d6aa679f733ea4 parent 5fbe2209cf65ae7450415ce764a7aa6f598389d9 Author: Vincent Forest <vincent.forest@meso-star.com> Date: Mon, 16 Nov 2020 21:47:39 +0100 Small upd of inclusions & coding style consistency Diffstat:
| M | src/htpp.c | | | 31 | ++++++++++++++----------------- |
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/htpp.c b/src/htpp.c @@ -31,24 +31,21 @@ #include <omp.h> #include <string.h> #include <sys/stat.h> /* S_IRUSR & S_IWUSR */ -#include <getopt.h> - -#ifdef COMPILER_CL - /* Wrap POSIX functions and constants */ -#include <io.h> -#define open _open -#define close _close -#define fdopen _fdopen -#define S_IRUSR S_IREAD -#define S_IWUSR S_IWRITE -#else - /* open/close functions */ -#include <unistd.h> -#endif -#ifdef COMPILER_CL -#define strtok_r strtok_s -#endif +#ifndef COMPILER_CL + #include <unistd.h> /* getopt & close functions */ +#else + #include <getopt.h> + #include <io.h> + + /* Wrap POSIX functions and constants */ + #define open _open + #define close _close + #define fdopen _fdopen + #define S_IRUSR S_IREAD + #define S_IWUSR S_IWRITE + #define strtok_r strtok_s +#endif /* !COMPILER_CL */ enum pixcpnt { PIXCPNT_X,