OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: consolidate PUBLIC macro definition

Browse Source 
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>
This commit is contained in:
Brian Paul
2015-03-03 09:01:03 -07:00
parent 25656753d7
commit 5bebd7099a
3 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/include/pipe/p_compiler.h
View File

@@ -111,18 +111,6 @@ typedef unsigned char boolean;
#endif #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 */ /* XXX: Use standard `__func__` instead */
#ifndef __FUNCTION__ #ifndef __FUNCTION__
# define __FUNCTION__ __func__ # define __FUNCTION__ __func__

20
src/mesa/main/compiler.h
View File

@@ -83,26 +83,6 @@ extern "C" {
#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))
# else
# define PUBLIC
# define USED
# endif
#endif
/* XXX: Use standard `__func__` instead */ /* XXX: Use standard `__func__` instead */
#ifndef __FUNCTION__ #ifndef __FUNCTION__
# define __FUNCTION__ __func__ # define __FUNCTION__ __func__

23
src/util/macros.h
View File

@@ -156,4 +156,27 @@ do { \
# endif # endif
#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 */ #endif /* UTIL_MACROS_H */