diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a9a694..c949c4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,10 +60,7 @@ target_sources(${PROJECT_NAME} include/gk_mkpqueue2.h include/gk_mkrandom.h include/gk_mksort.h include/gk_mkutils.h include/gk_proto.h include/gk_struct.h include/gk_types.h include/gkregex.h include/gk_ms_inttypes.h - include/gk_ms_stat.h include/gk_ms_stdint.h - # the following are shims for win32 systems - $<$:src/win32/adapt.c - include/win32/adapt.h>) + include/gk_ms_stat.h include/gk_ms_stdint.h) target_compile_definitions(${PROJECT_NAME} PUBLIC $<$:LINUX>) diff --git a/include/gk_arch.h b/include/gk_arch.h index b82fb6a..26fa312 100644 --- a/include/gk_arch.h +++ b/include/gk_arch.h @@ -35,7 +35,9 @@ #include "gk_ms_stdint.h" #include "gk_ms_inttypes.h" #include "gk_ms_stat.h" - #include "win32/adapt.h" + #include + #include + typedef int pid_t; #else #ifndef SUNOS #include diff --git a/include/win32/adapt.h b/include/win32/adapt.h deleted file mode 100644 index 35e60ed..0000000 --- a/include/win32/adapt.h +++ /dev/null @@ -1,14 +0,0 @@ -/* -\file win32/adapt.h -\brief Declaration of Win32 adaptation of POSIX functions and types -*/ -#ifndef _WIN32_ADAPT_H_ -#define _WIN32_ADAPT_H_ - -#include - -typedef DWORD pid_t; - -pid_t getpid(void); - -#endif /* _WIN32_ADAPT_H_ */ diff --git a/src/win32/adapt.c b/src/win32/adapt.c deleted file mode 100644 index 546857c..0000000 --- a/src/win32/adapt.c +++ /dev/null @@ -1,11 +0,0 @@ -/* -\file win32/adapt.c -\brief Implementation of Win32 adaptation of libc functions -*/ - -#include "adapt.h" - -pid_t getpid(void) -{ - return GetCurrentProcessId(); -}