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/indirect.h | |
| parent | 7b644ad52b574bec410d557155d666ac17fdf51a (diff) | |
import Mesa 11.0.6
Diffstat (limited to 'lib/mesa/src/glx/indirect.h')
| -rw-r--r-- | lib/mesa/src/glx/indirect.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/mesa/src/glx/indirect.h b/lib/mesa/src/glx/indirect.h index ef2cc5c59..1a6e91535 100644 --- a/lib/mesa/src/glx/indirect.h +++ b/lib/mesa/src/glx/indirect.h @@ -4,18 +4,18 @@ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. * (C) Copyright IBM Corporation 2004 * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL @@ -42,7 +42,7 @@ # else # define FASTCALL # endif -# if defined(__GNUC__) +# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) # define NOINLINE __attribute__((noinline)) # else # define NOINLINE @@ -714,7 +714,7 @@ extern _X_HIDDEN void __indirect_glProgramNamedParameter4fvNV(GLuint id, GLsizei extern _X_HIDDEN void __indirect_glBindFramebufferEXT(GLenum target, GLuint framebuffer); extern _X_HIDDEN void __indirect_glBindRenderbufferEXT(GLenum target, GLuint renderbuffer); -#ifdef GLX_INDIRECT_RENDERING +#ifdef GLX_SHARED_GLAPI extern _X_HIDDEN void (*__indirect_get_proc_address(const char *name))(void); #endif |