From 6c7a9073f840ef5ce88e0db3cc132810038cc0a4 Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Fri, 25 Nov 2022 00:57:19 +0100
Subject: [PATCH] Small code refactoring.

---
 hashset/hashset.vcxproj       |  4 ++--
 libhashset/include/hash_set.h | 10 +++++-----
 libhashset/libhashset.vcxproj |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hashset/hashset.vcxproj b/hashset/hashset.vcxproj
index 89f1db0..8d9f7a2 100644
--- a/hashset/hashset.vcxproj
+++ b/hashset/hashset.vcxproj
@@ -189,7 +189,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HASHSET_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
@@ -263,7 +263,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;HASHSET_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
diff --git a/libhashset/include/hash_set.h b/libhashset/include/hash_set.h
index 449c943..f53cda0 100644
--- a/libhashset/include/hash_set.h
+++ b/libhashset/include/hash_set.h
@@ -3,18 +3,18 @@
 /* This work has been released under the CC0 1.0 Universal license!           */
 /******************************************************************************/
 
-#ifndef _LIBHASHSET_INCLUDED
-#define _LIBHASHSET_INCLUDED
+#ifndef _INC_HASHSET_H
+#define _INC_HASHSET_H
 
 #include <stdlib.h>
 #include <stdint.h>
 
-#if defined(_MSC_VER) && defined(_DLL)
-#  ifdef _LIBHASHSET_EXPORTS
+#ifdef HASHSET_DLL
+#  ifdef _HASHSET_EXPORTS
 #    define HASHSET_API extern __declspec(dllexport)
 #  else
 #    define HASHSET_API extern __declspec(dllimport)
-# endif
+#  endif
 #else
 #  define HASHSET_API extern
 #endif
diff --git a/libhashset/libhashset.vcxproj b/libhashset/libhashset.vcxproj
index bdd8da4..f5999b7 100644
--- a/libhashset/libhashset.vcxproj
+++ b/libhashset/libhashset.vcxproj
@@ -204,7 +204,7 @@
       <ControlFlowGuard>false</ControlFlowGuard>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <AdditionalIncludeDirectories>$(ProjectDir)\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_DLL;_LIBHASHSET_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_DLL;HASHSET_DLL;_HASHSET_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -269,7 +269,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_DLL;_LIBHASHSET_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_DLL;HASHSET_DLL;_HASHSET_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>