Skip to content

Commit 7be8e73

Browse files
committed
Move ImportExportMacros.inl into Compiler.inl
Remove include guard for inlining_macros.h
1 parent dd2616a commit 7be8e73

File tree

5 files changed

+8
-18
lines changed

5 files changed

+8
-18
lines changed

src/Common/Common.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
<ClInclude Include="PlatformLinux.inl" />
205205
<ClInclude Include="PlatformWindows.inl" />
206206
<ClInclude Include="Util.hpp" />
207-
<ClInclude Include="ImportExportMacros.inl" />
208207
<ClInclude Include="_d3d_extensions.h" />
209208
</ItemGroup>
210209
<ItemGroup>

src/Common/Common.vcxproj.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@
8181
<ClInclude Include="..\xrCommon\xr_deque.h">
8282
<Filter>xrCommon</Filter>
8383
</ClInclude>
84-
<ClInclude Include="ImportExportMacros.inl">
85-
<Filter>Platform</Filter>
86-
</ClInclude>
8784
<ClInclude Include="Common.hpp" />
8885
</ItemGroup>
8986
<ItemGroup>

src/Common/Compiler.inl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@
66
#include <intrin.h> // for __debugbreak
77
#endif
88

9-
#include "Common/ImportExportMacros.inl"
9+
#if defined(__GNUC__)
10+
#define XR_EXPORT __attribute__ ((visibility("default")))
11+
#define XR_IMPORT __attribute__ ((visibility("default")))
12+
#elif defined(_MSC_VER)
13+
#define XR_EXPORT __declspec(dllexport)
14+
#define XR_IMPORT __declspec(dllimport)
15+
#endif
16+
1017
#include "xrCommon/inlining_macros.h"
1118

1219
#if defined(__GNUC__)

src/Common/ImportExportMacros.inl

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/xrCommon/inlining_macros.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#pragma once
2-
#ifndef INLINING_MACROS_H
3-
#define INLINING_MACROS_H
42

53
#if defined(__GNUC__)
64
#define NO_INLINE __attribute__((noinline))
@@ -19,5 +17,3 @@
1917
#define IC inline
2018
#define ICF FORCE_INLINE
2119
#define ICN NO_INLINE
22-
23-
#endif

0 commit comments

Comments
 (0)