diff options
| author | Kyle Brenneman <[email protected]> | 2015-09-28 11:59:21 -0600 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-10-02 13:22:46 +0100 |
| commit | a27f2d991b1723c3349623401ce3c8f26dcdb28b (patch) | |
| tree | c3867b3bf96c436b4263910cfecc8c81da36b253 /src/glx/glxcmds.c | |
| parent | 85313ff8ab1e3fad9679e05a97a7fd55ecf87291 (diff) | |
glx: Fix build errors with --enable-mangling (v2)
Rearranged the GLX_ALIAS macro in glextensions.h so that it will pick up
the renames from glx_mangle.h.
Fixed the alias attribute for glXGetProcAddress when USE_MGL_NAMESPACE is
defined.
v2: Add a comment clarifying why GLX_ALIAS needs two macros.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55552
Signed-off-by: Kyle Brenneman <[email protected]>
Cc: "10.6 11.0" <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/glx/glxcmds.c')
| -rw-r--r-- | src/glx/glxcmds.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 26ff804297f..93e8db5a367 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -2646,7 +2646,11 @@ _X_EXPORT void (*glXGetProcAddressARB(const GLubyte * procName)) (void) */ _X_EXPORT void (*glXGetProcAddress(const GLubyte * procName)) (void) #if defined(__GNUC__) && !defined(GLX_ALIAS_UNSUPPORTED) +# if defined(USE_MGL_NAMESPACE) + __attribute__ ((alias("mglXGetProcAddressARB"))); +# else __attribute__ ((alias("glXGetProcAddressARB"))); +# endif #else { return glXGetProcAddressARB(procName); |