Rename xr_impexp_macros.h -> ImportExportMacros.inl

OpenXRay · Nov 9, 2017 · a07ace1 · a07ace1
1 parent b92f0af
commit a07ace1
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/src/Common/Common.vcxproj b/src/Common/Common.vcxproj
@@ -203,7 +203,7 @@
     <ClInclude Include="PlatformLinux.inl" />
     <ClInclude Include="PlatformWindows.inl" />
     <ClInclude Include="Util.hpp" />
-    <ClInclude Include="xr_impexp_macros.h" />
+    <ClInclude Include="ImportExportMacros.inl" />
     <ClInclude Include="_d3d_extensions.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Common/Common.vcxproj.filters b/src/Common/Common.vcxproj.filters
@@ -81,7 +81,7 @@
     <ClInclude Include="..\xrCommon\xr_deque.h">
       <Filter>xrCommon</Filter>
     </ClInclude>
-    <ClInclude Include="xr_impexp_macros.h">
+    <ClInclude Include="ImportExportMacros.inl">
       <Filter>Platform</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/src/Common/Compiler.inl b/src/Common/Compiler.inl
@@ -6,7 +6,7 @@
 #include <intrin.h> // for __debugbreak
 #endif
 
-#include "xr_impexp_macros.h"
+#include "Common/ImportExportMacros.inl"
 #include "xrCommon/inlining_macros.h"
 
 #if defined(__GNUC__)

diff --git a/src/Common/xr_impexp_macros.h → src/Common/ImportExportMacros.inl b/src/Common/xr_impexp_macros.h → src/Common/ImportExportMacros.inl
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef XR_IMPEXP_MACROS_H
-#define XR_IMPEXP_MACROS_H
 
 #if defined(__GNUC__)
 #define XR_EXPORT __attribute__ ((visibility("default")))
@@ -9,5 +7,3 @@
 #define XR_EXPORT __declspec(dllexport)
 #define XR_IMPORT __declspec(dllimport)
 #endif
-
-#endif
diff --git a/src/xrCore/xrCore_impexp.h b/src/xrCore/xrCore_impexp.h
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef XRCORE_IMPEXP_H
 #define XRCORE_IMPEXP_H
-#include "Common/xr_impexp_macros.h"
+#include "Common/ImportExportMacros.inl"
 
 #ifdef XRCORE_EXPORTS
 #define XRCORE_API XR_EXPORT