aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/SConscript1
-rw-r--r--src/mapi/u_compiler.h22
2 files changed, 2 insertions, 21 deletions
diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index 84a50684b97..8ded46f32e0 100644
--- a/src/mapi/glapi/SConscript
+++ b/src/mapi/glapi/SConscript
@@ -27,6 +27,7 @@ if env['platform'] == 'windows':
env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
env.Append(CPPPATH = [
+ '#/src',
'#/src/mapi',
'#/src/mesa',
Dir('..'), # src/mapi build path
diff --git a/src/mapi/u_compiler.h b/src/mapi/u_compiler.h
index 8ed0f712f5d..cd80f681141 100644
--- a/src/mapi/u_compiler.h
+++ b/src/mapi/u_compiler.h
@@ -2,26 +2,6 @@
#define _U_COMPILER_H_
#include "c99_compat.h" /* inline, __func__, etc. */
-
-/* Function visibility */
-#ifndef PUBLIC
-# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-# define PUBLIC __attribute__((visibility("default")))
-# elif defined(_MSC_VER)
-# define PUBLIC __declspec(dllexport)
-# else
-# define PUBLIC
-# endif
-#endif
-
-#ifndef likely
-# if defined(__GNUC__)
-# define likely(x) __builtin_expect(!!(x), 1)
-# define unlikely(x) __builtin_expect(!!(x), 0)
-# else
-# define likely(x) (x)
-# define unlikely(x) (x)
-# endif
-#endif
+#include "util/macros.h"
#endif /* _U_COMPILER_H_ */