From 478dfb3cb81ddb6947ccb426be675ae58aceb323 Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Thu, 3 Mar 2022 15:01:32 -0500 Subject: [PATCH] Platform: Windows: Create trampoline header This way windows.h can be included if needed without a guard, and we have a place to stub out defines for other platforms if necessary. --- include/icsneo/platform/windows.h | 8 ++++++++ include/icsneo/platform/windows/dynamiclib.h | 2 +- include/icsneo/platform/windows/internal/pcapdll.h | 2 +- platform/windows/registry.cpp | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 include/icsneo/platform/windows.h diff --git a/include/icsneo/platform/windows.h b/include/icsneo/platform/windows.h new file mode 100644 index 0000000..f3629a6 --- /dev/null +++ b/include/icsneo/platform/windows.h @@ -0,0 +1,8 @@ +#ifndef __PLATFORM_WINDOWS_H_ +#define __PLATFORM_WINDOWS_H_ + +#if defined _WIN32 +#include "icsneo/platform/windows/windows.h" +#endif + +#endif \ No newline at end of file diff --git a/include/icsneo/platform/windows/dynamiclib.h b/include/icsneo/platform/windows/dynamiclib.h index 72c8a26..8ada4d4 100644 --- a/include/icsneo/platform/windows/dynamiclib.h +++ b/include/icsneo/platform/windows/dynamiclib.h @@ -1,7 +1,7 @@ #ifndef __DYNAMICLIB_WINDOWS_H_ #define __DYNAMICLIB_WINDOWS_H_ -#include "icsneo/platform/windows/windows.h" +#include "icsneo/platform/windows.h" #ifdef ICSNEOC_MAKEDLL #define DLLExport __declspec(dllexport) diff --git a/include/icsneo/platform/windows/internal/pcapdll.h b/include/icsneo/platform/windows/internal/pcapdll.h index 14db906..373746a 100644 --- a/include/icsneo/platform/windows/internal/pcapdll.h +++ b/include/icsneo/platform/windows/internal/pcapdll.h @@ -3,7 +3,7 @@ #ifdef __cplusplus -#include "icsneo/platform/windows/windows.h" +#include "icsneo/platform/windows.h" #include #include diff --git a/platform/windows/registry.cpp b/platform/windows/registry.cpp index 698d5b1..2a37170 100644 --- a/platform/windows/registry.cpp +++ b/platform/windows/registry.cpp @@ -1,5 +1,5 @@ #include "icsneo/platform/windows/registry.h" -#include "icsneo/platform/windows/windows.h" +#include "icsneo/platform/windows.h" #include #include #include