htpp

commit 0ca78add7e1852f8d6e74abce6adc571fadcad54
parent d3eeebcdeddaae0bca8ecb818479a2c2528d2cbe
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 11 Jan 2023 11:26:12 +0100

Remove deprecated CL compiler support

Diffstat:
M
cmake/CMakeLists.txt
 | 
11
-----------
M
src/htpp.c
 | 
18
++----------------

2 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -27,9 +27,6 @@ find_package(RCMake 0.3 REQUIRED)
 find_package(RSys 0.9 REQUIRED)
 find_package(StarCMap 0.0 REQUIRED)
 find_package(OpenMP 1.2 REQUIRED)
-if(MSVC)
-  find_package(MuslGetopt REQUIRED)
-endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${RCMAKE_SOURCE_DIR})
 include(rcmake)
@@ -39,9 +36,6 @@ include_directories(
   ${RSys_INCLUDE_DIR}
   ${StarCMap_INCLUDE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR})
-if(MSVC)
-  include_directories(${MuslGetopt_INCLUDE_DIR})
-endif()
 
 ################################################################################
 # Configure and define targets
@@ -67,12 +61,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
   set(MATH_LIB m)
 endif()
 
-if(MSVC)
-  set(GETOPT_LIB MuslGetopt)
-endif()
-
 target_link_libraries(htpp RSys StarCMap ${MATH_LIB} ${GETOPT_LIB})
-
 set_target_properties(htpp PROPERTIES COMPILE_FLAGS "${OpenMP_C_FLAGS}")
 
 if(CMAKE_COMPILER_IS_GNUCC)
diff --git a/src/htpp.c b/src/htpp.c
@@ -32,21 +32,7 @@
 #include <omp.h>
 #include <string.h>
 #include <sys/stat.h> /* S_IRUSR & S_IWUSR */
-
-#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 */
+#include <unistd.h> /* getopt & close functions */
 
 enum pixcpnt {
   PIXCPNT_X,
@@ -138,7 +124,7 @@ print_help(const char* cmd)
     cmd);
   printf("\n");
   printf(
-"  -f               overwrite the OUTPUT file if it already exists.\n");
+"  -f               overwrite the output file if it already exists.\n");
   printf(
 "  -h               display this help and exit.\n");
   printf(