xserver: Branch 'xorg-server-1.5-apple'

[Jeremy Huddleston]

 glx/indirect_reqsize.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 31a20a573b867fb7f02da15425e3b92eccb82dec
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Jun 6 22:17:44 2009 -0700

    GLX: Make sure the types match for ALIAS in indirect_reqsize.c

diff --git a/glx/indirect_reqsize.c b/glx/indirect_reqsize.c
index 954eecd..bd4d306 100644
--- a/glx/indirect_reqsize.c
+++ b/glx/indirect_reqsize.c
@@ -39,12 +39,12 @@
 #endif
 #ifdef HAVE_ALIAS
 #  define ALIAS2(from,to) \
-    GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
+    int __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
         __attribute__ ((alias( # to )));
 #  define ALIAS(from,to) ALIAS2( from, __glX ## to ## ReqSize )
 #else
 #  define ALIAS(from,to) \
-    GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
+    int __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
     { return __glX ## to ## ReqSize( pc, swap ); }
 #endif