X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglx%2Findirect_size.c;h=7b61b2abe6a85e3f31b17fccfd46054eefa2f912;hb=11aa82cc0bda6bd9162f76553a3f68e28978edae;hp=411a0e42c55e3fa96254657e2c942571f2f62c51;hpb=7662e3519bef3802024da3050b886068281e02b1;p=mesa.git

diff --git a/src/glx/indirect_size.c b/src/glx/indirect_size.c
index 411a0e42c55..7b61b2abe6a 100644
--- a/src/glx/indirect_size.c
+++ b/src/glx/indirect_size.c
@@ -26,44 +26,39 @@
  */
 
 
+#include <X11/Xfuncproto.h>
 #include <GL/gl.h>
 #include "indirect_size.h"
 
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-#    define PURE __attribute__((pure))
-#  else
-#    define PURE
-#  endif
-
-#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-#    define FASTCALL __attribute__((fastcall))
-#  else
-#    define FASTCALL
-#  endif
+#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#define PURE __attribute__((pure))
+#else
+#define PURE
+#endif
 
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
-#    define INTERNAL  __attribute__((visibility("internal")))
-#  else
-#    define INTERNAL
-#  endif
+#if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#define FASTCALL __attribute__((fastcall))
+#else
+#define FASTCALL
+#endif
 
 
 #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)
-#  undef HAVE_ALIAS
+#undef HAVE_ALIAS
 #endif
 #ifdef HAVE_ALIAS
-#  define ALIAS2(from,to) \
-    INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
+#define ALIAS2(from,to) \
+    _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
         __attribute__ ((alias( # to )));
-#  define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )
+#define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )
 #else
-#  define ALIAS(from,to) \
-    INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
+#define ALIAS(from,to) \
+    _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) {
@@ -383,6 +378,5 @@ ALIAS(Fogiv, Fogfv)
     ALIAS(ColorTableParameteriv, ColorTableParameterfv)
     ALIAS(ConvolutionParameteriv, ConvolutionParameterfv)
     ALIAS(PointParameterivNV, PointParameterfvEXT)
-#  undef PURE
-#  undef FASTCALL
-#  undef INTERNAL
+#undef PURE
+#undef FASTCALL