mesa: consolidate general ubyte texstore code

[mesa.git] / src / glx / indirect_size.c

diff --git a/src/glx/indirect_size.c b/src/glx/indirect_size.c
index 137e69cb044a89b12a0998e8e0ba5936c6ef65a8..7b61b2abe6a85e3f31b17fccfd46054eefa2f912 100644 (file)
--- a/src/glx/indirect_size.c
+++ b/src/glx/indirect_size.c
@@ -26,6 +26,7 @@
  */
 
 
+#include <X11/Xfuncproto.h>
 #include <GL/gl.h>
 #include "indirect_size.h"
 
@@ -41,29 +42,23 @@
 #define FASTCALL
 #endif
 
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
-#define INTERNAL  __attribute__((visibility("internal")))
-#else
-#define INTERNAL
-#endif
-
 
 #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)
 #undef HAVE_ALIAS
 #endif
 #ifdef HAVE_ALIAS
 #define ALIAS2(from,to) \
-    INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
+    _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
         __attribute__ ((alias( # to )));
 #define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )
 #else
 #define ALIAS(from,to) \
-    INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
+    _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
     { return __gl ## to ## _size( e ); }
 #endif
 
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glCallLists_size(GLenum e)
 {
     switch (e) {
@@ -87,7 +82,7 @@ __glCallLists_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glFogfv_size(GLenum e)
 {
     switch (e) {
@@ -106,7 +101,7 @@ __glFogfv_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glLightfv_size(GLenum e)
 {
     switch (e) {
@@ -128,7 +123,7 @@ __glLightfv_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glLightModelfv_size(GLenum e)
 {
     switch (e) {
@@ -144,7 +139,7 @@ __glLightModelfv_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glMaterialfv_size(GLenum e)
 {
     switch (e) {
@@ -163,7 +158,7 @@ __glMaterialfv_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glTexParameterfv_size(GLenum e)
 {
     switch (e) {
@@ -219,7 +214,7 @@ __glTexParameterfv_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glTexEnvfv_size(GLenum e)
 {
     switch (e) {
@@ -256,7 +251,7 @@ __glTexEnvfv_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glTexGendv_size(GLenum e)
 {
     switch (e) {
@@ -270,7 +265,7 @@ __glTexGendv_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glMap1d_size(GLenum e)
 {
     switch (e) {
@@ -292,7 +287,7 @@ __glMap1d_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glMap2d_size(GLenum e)
 {
     switch (e) {
@@ -314,7 +309,7 @@ __glMap2d_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glColorTableParameterfv_size(GLenum e)
 {
     switch (e) {
@@ -326,7 +321,7 @@ __glColorTableParameterfv_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glConvolutionParameterfv_size(GLenum e)
 {
     switch (e) {
@@ -345,7 +340,7 @@ __glConvolutionParameterfv_size(GLenum e)
     }
 }
 
-INTERNAL PURE FASTCALL GLint
+_X_INTERNAL PURE FASTCALL GLint
 __glPointParameterfvEXT_size(GLenum e)
 {
     switch (e) {
@@ -385,4 +380,3 @@ ALIAS(Fogiv, Fogfv)
     ALIAS(PointParameterivNV, PointParameterfvEXT)
 #undef PURE
 #undef FASTCALL
-#undef INTERNAL