diff options
| author | Ian Elliott <ian@LunarG.com> | 2015-02-12 13:20:10 -0700 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-02-12 16:31:13 -0700 |
| commit | 22ec3a52c48963ef92a87fd32a9cc27dae617868 (patch) | |
| tree | e985667d73a283ee1bb2e355c06fdf43002ad672 /loader | |
| parent | 33e26ab3470df2a9aba0171dc0815776be94d73f (diff) | |
| download | usermoji-22ec3a52c48963ef92a87fd32a9cc27dae617868.tar.xz | |
Win/icd: Move STATIC_INLINE macro, and use for magic funcs.
The STATIC_INLINE macro is now in "xglPlatform.h". It is also now being used
by the *_loader_magic_value() functions. This allows it to be compiled on
Windows.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader_platform.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/loader/loader_platform.h b/loader/loader_platform.h index 98c2d39b..c14ea9b9 100644 --- a/loader/loader_platform.h +++ b/loader/loader_platform.h @@ -61,9 +61,6 @@ #define DEFAULT_XGL_LAYERS_PATH ".:/usr/lib/i386-linux-gnu/xgl:/usr/lib/x86_64-linux-gnu/xgl" #endif -// C99: -#define STATIC_INLINE static inline - #define PRINTF_SIZE_T_SPECIFIER "%zu" // Dynamic Loading: @@ -172,7 +169,6 @@ using namespace std; // work-around (Note: The _CRT_SECURE_NO_WARNINGS macro must be set in the // "CMakeLists.txt" file). #define snprintf _snprintf -#define STATIC_INLINE static #define PRINTF_SIZE_T_SPECIFIER "%Iu" // Microsoft also doesn't have basename(). Paths are different on Windows, and // so this is just a temporary solution in order to get us compiling, so that we |