diff options
author | marha <marha@users.sourceforge.net> | 2014-09-08 23:30:36 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-09-08 23:30:36 +0200 |
commit | e16399e57caac9e859a7d28921c73ef9839b571e (patch) | |
tree | b86ed43f749ebfe0bb3842fcd76a34e386011fcc /mesalib/src/mesa/main/api_arrayelt.c | |
parent | 166caebfaa2b217332a345ffb02c5b9e52f65a3d (diff) | |
parent | cb346e228aeb500cd61ec86644c034c238332d3b (diff) | |
download | vcxsrv-e16399e57caac9e859a7d28921c73ef9839b571e.tar.gz vcxsrv-e16399e57caac9e859a7d28921c73ef9839b571e.tar.bz2 vcxsrv-e16399e57caac9e859a7d28921c73ef9839b571e.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/api_arrayelt.c')
-rw-r--r-- | mesalib/src/mesa/main/api_arrayelt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/api_arrayelt.c b/mesalib/src/mesa/main/api_arrayelt.c index ebeba8883..536326f6e 100644 --- a/mesalib/src/mesa/main/api_arrayelt.c +++ b/mesalib/src/mesa/main/api_arrayelt.c @@ -75,7 +75,7 @@ typedef struct { /** Cast wrapper */ -static INLINE AEcontext * +static inline AEcontext * AE_CONTEXT(struct gl_context *ctx) { return (AEcontext *) ctx->aelt_context; @@ -87,7 +87,7 @@ AE_CONTEXT(struct gl_context *ctx) * in the range [0, 7]. Luckily these type tokens are sequentially * numbered in gl.h, except for GL_DOUBLE. */ -static INLINE int +static inline int TYPE_IDX(GLenum t) { return t == GL_DOUBLE ? 7 : t & 7; |