diff options
| author | Emil Velikov <[email protected]> | 2016-12-05 19:52:43 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-01-18 16:01:14 +0000 |
| commit | dfc84c2296891858ef9d12800ae778063b76c05a (patch) | |
| tree | 797ab8b57fe947a28e29f8ab705d3ece5f58e157 /src/glx | |
| parent | 63c58dfc653c499aab5b8d0ea07f1dc1af88c856 (diff) | |
mesa: make use of HAVE_FUNC_ATTRIBUTE_ALIAS macro
We must make sure that xserver has an equivalent one-line
change to its configure.ac as the glx/glapi headers get copied over.
Then again, xserver does _not_ seem to set HAVE_ALIAS to begin with so
one might want to look into that first.
Cc: Adam Jackson <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/glxcmds.c | 4 | ||||
| -rw-r--r-- | src/glx/glxextensions.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 8980de3733a..7266b58652e 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -2664,7 +2664,7 @@ _GLX_PUBLIC void (*glXGetProcAddressARB(const GLubyte * procName)) (void) * \sa glXGetProcAddressARB */ _GLX_PUBLIC void (*glXGetProcAddress(const GLubyte * procName)) (void) -#if defined(__GNUC__) && !defined(GLX_ALIAS_UNSUPPORTED) +# ifdef HAVE_FUNC_ATTRIBUTE_ALIAS # if defined(USE_MGL_NAMESPACE) __attribute__ ((alias("mglXGetProcAddressARB"))); # else @@ -2674,7 +2674,7 @@ _GLX_PUBLIC void (*glXGetProcAddress(const GLubyte * procName)) (void) { return glXGetProcAddressARB(procName); } -#endif /* __GNUC__ */ +#endif /* HAVE_FUNC_ATTRIBUTE_ALIA */ #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h index 6a670063025..21ad02a44b4 100644 --- a/src/glx/glxextensions.h +++ b/src/glx/glxextensions.h @@ -281,7 +281,7 @@ typedef void (*PFNGLXDISABLEEXTENSIONPROC) (const char *name); /* GLX_ALIAS should be used for functions with a non-void return type. GLX_ALIAS_VOID is for functions with a void return type. */ -# if defined(__GNUC__) && !defined(GLX_ALIAS_UNSUPPORTED) +# ifdef HAVE_FUNC_ATTRIBUTE_ALIAS /* GLX_ALIAS and GLX_ALIAS_VOID both expand to the macro GLX_ALIAS2. Using the * extra expansion means that the name mangling macros in glx_mangle.h will * apply before stringification, so the alias attribute will have a string like @@ -300,7 +300,7 @@ typedef void (*PFNGLXDISABLEEXTENSIONPROC) (const char *name); # define GLX_ALIAS_VOID(real_func, proto_args, args, aliased_func) \ void real_func proto_args \ { aliased_func args ; } -# endif /* __GNUC__ */ +# endif /* HAVE_FUNC_ATTRIBUTE_ALIAS */ #ifdef __cplusplus } |