From 22ec3a52c48963ef92a87fd32a9cc27dae617868 Mon Sep 17 00:00:00 2001 From: Ian Elliott Date: Thu, 12 Feb 2015 13:20:10 -0700 Subject: 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. --- loader/loader_platform.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'loader') 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 -- cgit v1.2.3