diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:45 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:45 +0000 |
| commit | 3e40341f9dcd7c1bbc9afb8ddb812304820396cf (patch) | |
| tree | 274b3f522afe1da16ab2b5347758c908bc23fac4 /lib/mesa/src/glx/glxextensions.h | |
| parent | 7b644ad52b574bec410d557155d666ac17fdf51a (diff) | |
import Mesa 11.0.6
Diffstat (limited to 'lib/mesa/src/glx/glxextensions.h')
| -rw-r--r-- | lib/mesa/src/glx/glxextensions.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lib/mesa/src/glx/glxextensions.h b/lib/mesa/src/glx/glxextensions.h index 21ad02a44..3a9bc8230 100644 --- a/lib/mesa/src/glx/glxextensions.h +++ b/lib/mesa/src/glx/glxextensions.h @@ -31,10 +31,6 @@ #ifndef GLX_GLXEXTENSIONS_H #define GLX_GLXEXTENSIONS_H -#ifdef __cplusplus -extern "C" { -#endif - enum { ARB_create_context_bit = 0, @@ -49,7 +45,6 @@ enum EXT_import_context_bit, EXT_framebuffer_sRGB_bit, EXT_fbconfig_packed_float_bit, - EXT_create_context_es_profile_bit, EXT_create_context_es2_profile_bit, MESA_copy_sub_buffer_bit, MESA_depth_float_bit, @@ -281,7 +276,11 @@ 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 HAVE_FUNC_ATTRIBUTE_ALIAS +#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) /* 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,10 +299,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 /* HAVE_FUNC_ATTRIBUTE_ALIAS */ - -#ifdef __cplusplus -} -#endif +# endif /* __GNUC__ */ +#endif /* GLX_NO_STATIC_EXTENSION_FUNCTIONS */ #endif /* GLX_GLXEXTENSIONS_H */ |