mesa: move some helper functions from fboobject.c to glformats.c

[mesa.git] / src / mesa / main / texstate.h

diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 987123036a6f307bf1bce05566035ab2bf59bfb9..7abf9101ebf35c576aeaf25291aa93a1fe4761c3 100644 (file)
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -40,7 +40,7 @@
  * Return pointer to current texture unit.
  * This the texture unit set by glActiveTexture(), not glClientActiveTexture().
  */
-static INLINE struct gl_texture_unit *
+static inline struct gl_texture_unit *
 _mesa_get_current_tex_unit(struct gl_context *ctx)
 {
    ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
@@ -62,10 +62,10 @@ _mesa_print_texunit_state( struct gl_context *ctx, GLuint unit );
 /*@{*/
 
 extern void GLAPIENTRY
-_mesa_ActiveTextureARB( GLenum target );
+_mesa_ActiveTexture( GLenum target );
 
 extern void GLAPIENTRY
-_mesa_ClientActiveTextureARB( GLenum target );
+_mesa_ClientActiveTexture( GLenum target );
 
 /*@}*/