From 360e01d824d6d22319d736f860eaa86896f0da90 Mon Sep 17 00:00:00 2001 From: brainiac Date: Thu, 18 Dec 2025 00:23:57 -0800 Subject: [PATCH] add new platform headers to simplify including windows/posix headers --- common/CMakeLists.txt | 6 ++++++ common/platform/inet.h | 4 ++++ common/platform/platform.h | 7 +++++++ common/platform/posix/include_inet.h | 8 ++++++++ common/platform/posix/include_pthreads.h | 8 ++++++++ common/platform/win/include_windows.h | 23 +++++++++++++++++++++++ common/platform/win/include_winsock2.h | 7 +++++++ 7 files changed, 63 insertions(+) create mode 100644 common/platform/inet.h create mode 100644 common/platform/platform.h create mode 100644 common/platform/posix/include_inet.h create mode 100644 common/platform/posix/include_pthreads.h create mode 100644 common/platform/win/include_windows.h create mode 100644 common/platform/win/include_winsock2.h diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index d5fb90abb..22dd6f903 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -101,6 +101,12 @@ set(common_sources perl_eqdb.cpp perl_eqdb_res.cpp platform.cpp + platform/inet.h + platform/platform.h + platform/posix/include_inet.h + platform/posix/include_pthreads.h + platform/win/include_windows.h + platform/win/include_winsock2.h proc_launcher.cpp process.cpp process/process.cpp diff --git a/common/platform/inet.h b/common/platform/inet.h new file mode 100644 index 000000000..2cdf672ca --- /dev/null +++ b/common/platform/inet.h @@ -0,0 +1,4 @@ +#pragma once + +#include "common/platform/posix/include_inet.h" +#include "common/platform/win/include_winsock2.h" diff --git a/common/platform/platform.h b/common/platform/platform.h new file mode 100644 index 000000000..81624a808 --- /dev/null +++ b/common/platform/platform.h @@ -0,0 +1,7 @@ +#pragma once + +#ifdef _WINDOWS +#include "common/platform/win/include_windows.h" +#else +#include +#endif diff --git a/common/platform/posix/include_inet.h b/common/platform/posix/include_inet.h new file mode 100644 index 000000000..d50d9e164 --- /dev/null +++ b/common/platform/posix/include_inet.h @@ -0,0 +1,8 @@ +#pragma once + +#ifndef _WINDOWS + +#include +#include + +#endif // !_WINDOWS diff --git a/common/platform/posix/include_pthreads.h b/common/platform/posix/include_pthreads.h new file mode 100644 index 000000000..c8e550baf --- /dev/null +++ b/common/platform/posix/include_pthreads.h @@ -0,0 +1,8 @@ +#pragma once + +#ifndef _WINDOWS + +#include "common/unix.h" +#include + +#endif // !_WINDOWS diff --git a/common/platform/win/include_windows.h b/common/platform/win/include_windows.h new file mode 100644 index 000000000..9a1f21818 --- /dev/null +++ b/common/platform/win/include_windows.h @@ -0,0 +1,23 @@ +#pragma once + +#ifdef _WINDOWS + +#ifndef NOMINMAX +#define NOMINMAX +#endif + +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif + +#include + +#ifdef GetCurrentTime +#undef GetCurrentTime +#endif + +#ifdef GetClassName +#undef GetClassName +#endif + +#endif // _WINDOWS diff --git a/common/platform/win/include_winsock2.h b/common/platform/win/include_winsock2.h new file mode 100644 index 000000000..563a49b58 --- /dev/null +++ b/common/platform/win/include_winsock2.h @@ -0,0 +1,7 @@ +#pragma once + +#ifdef _WINDOWS + +#include + +#endif // _WINDOWS