From e2e7bd6c1f979179e6840cf0e8db72fc72751650 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 28 Sep 2009 21:55:47 -0600
Subject: [PATCH] mesa: move StoreTexImageFunc typedef to .c file

---
 src/mesa/main/texstore.c |  8 +++++++-
 src/mesa/main/texstore.h | 14 ++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index e8c3e23b5bf..ca298bb2371 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -76,6 +76,12 @@ enum {
 };
 
 
+/**
+ * Texture image storage function.
+ */
+typedef GLboolean (*StoreTexImageFunc)(TEXSTORE_PARAMS);
+
+
 /**
  * Return GL_TRUE if the given image format is one that be converted
  * to another format by swizzling.
@@ -3250,7 +3256,7 @@ texstore_funcs[MESA_FORMAT_COUNT] =
 /**
  * Return the StoreTexImageFunc pointer to store an image in the given format.
  */
-StoreTexImageFunc
+static StoreTexImageFunc
 _mesa_get_texstore_func(gl_format format)
 {
    GLuint i;
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index ad4773533e7..4a217df1039 100644
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -68,11 +68,8 @@
 	const struct gl_pixelstore_attrib *srcPacking
 
 
-
-/**
- * Texture image storage function.
- */
-typedef GLboolean (*StoreTexImageFunc)(TEXSTORE_PARAMS);
+extern GLboolean
+_mesa_texstore(TEXSTORE_PARAMS);
 
 
 extern GLchan *
@@ -148,13 +145,6 @@ _mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
                           struct gl_texture_image *texImage);
 
 
-extern StoreTexImageFunc
-_mesa_get_texstore_func(gl_format format);
-
-extern GLboolean
-_mesa_texstore(TEXSTORE_PARAMS);
-
-
 extern void
 _mesa_store_compressed_teximage1d(GLcontext *ctx, GLenum target, GLint level,
                                   GLint internalFormat,
-- 
2.30.2