diff options
| author | Brian Paul <brianp@vmware.com> | 2015-03-03 09:01:03 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2015-03-04 08:33:48 -0700 |
| commit | 5bebd7099ab22c6f1498cd928170561718d6ff36 (patch) | |
| tree | 0c7f8c9c773312d1a753974825e40064222a2397 | |
| parent | 25656753d765680ea4a592ff812deac132e2262d (diff) | |
mesa: consolidate PUBLIC macro definition
Define the macro in src/util/macros.h rather than in two different
places. Note that USED isn't actually used anywhere at this time.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
| -rw-r--r-- | src/gallium/include/pipe/p_compiler.h | 12 | ||||
| -rw-r--r-- | src/mesa/main/compiler.h | 20 | ||||
| -rw-r--r-- | src/util/macros.h | 23 |
3 files changed, 23 insertions, 32 deletions
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h index cc4f4447ce..0e953695b5 100644 --- a/src/gallium/include/pipe/p_compiler.h +++ b/src/gallium/include/pipe/p_compiler.h @@ -111,18 +111,6 @@ typedef unsigned char boolean; #endif -/* 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 - - /* XXX: Use standard `__func__` instead */ #ifndef __FUNCTION__ # define __FUNCTION__ __func__ diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 7f2d732ae8..95581fb491 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -83,26 +83,6 @@ extern "C" { #endif -/** - * PUBLIC/USED macros - * - * If we build the library with gcc's -fvisibility=hidden flag, we'll - * use the PUBLIC macro to mark functions that are to be exported. - * - * We also need to define a USED attribute, so the optimizer doesn't - * inline a static function that we later use in an alias. - ajax - */ -#ifndef PUBLIC -# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) -# define PUBLIC __attribute__((visibility("default"))) -# define USED __attribute__((used)) -# else -# define PUBLIC -# define USED -# endif -#endif - - /* XXX: Use standard `__func__` instead */ #ifndef __FUNCTION__ # define __FUNCTION__ __func__ diff --git a/src/util/macros.h b/src/util/macros.h index eec8b9352c..b862bfd5f1 100644 --- a/src/util/macros.h +++ b/src/util/macros.h @@ -156,4 +156,27 @@ do { \ # endif #endif +/** + * PUBLIC/USED macros + * + * If we build the library with gcc's -fvisibility=hidden flag, we'll + * use the PUBLIC macro to mark functions that are to be exported. + * + * We also need to define a USED attribute, so the optimizer doesn't + * inline a static function that we later use in an alias. - ajax + */ +#ifndef PUBLIC +# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) +# define PUBLIC __attribute__((visibility("default"))) +# define USED __attribute__((used)) +# elif defined(_MSC_VER) +# define PUBLIC __declspec(dllexport) +# define USED +# else +# define PUBLIC +# define USED +# endif +#endif + + #endif /* UTIL_MACROS_H */ |