From 4c58069f5013f0a621503525f7d5193bfe9976b3 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Mon, 14 Aug 2017 09:45:54 +0000 Subject: Import Mesa 17.1.6 --- lib/mesa/src/glx/glxextensions.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'lib/mesa/src/glx/glxextensions.h') diff --git a/lib/mesa/src/glx/glxextensions.h b/lib/mesa/src/glx/glxextensions.h index 743ed97fe..21ad02a44 100644 --- a/lib/mesa/src/glx/glxextensions.h +++ b/lib/mesa/src/glx/glxextensions.h @@ -281,11 +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. */ -#ifdef GLX_NO_STATIC_EXTENSION_FUNCTIONS -# define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) -# define GLX_ALIAS_VOID(real_func, proto_args, args, aliased_func) -#else -# 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 @@ -304,8 +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 /* GLX_NO_STATIC_EXTENSION_FUNCTIONS */ +# endif /* HAVE_FUNC_ATTRIBUTE_ALIAS */ #ifdef __cplusplus } -- cgit v1.2.3