diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-23 10:01:52 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-23 10:01:52 +0100 |
| commit | e22891346b85a7db40dec7260a100f90b451cbc8 (patch) | |
| tree | a7dd2d6757253947bcc821abbf68fd24d3301e89 /xorg-server/glx/indirect_reqsize.c | |
| parent | abacebe06d9f3d2fe1b7d256bd86cddbfa592a85 (diff) | |
| download | vcxsrv-e22891346b85a7db40dec7260a100f90b451cbc8.tar.gz vcxsrv-e22891346b85a7db40dec7260a100f90b451cbc8.tar.bz2 vcxsrv-e22891346b85a7db40dec7260a100f90b451cbc8.zip | |
git mesa pixman xserver xkeyboard-config update 24 dec 2011
Diffstat (limited to 'xorg-server/glx/indirect_reqsize.c')
| -rw-r--r-- | xorg-server/glx/indirect_reqsize.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/glx/indirect_reqsize.c b/xorg-server/glx/indirect_reqsize.c index 35bb9370f..20e2a5de1 100644 --- a/xorg-server/glx/indirect_reqsize.c +++ b/xorg-server/glx/indirect_reqsize.c @@ -35,16 +35,16 @@ #define __GLX_PAD(x) (((x) + 3) & ~3) #if defined(__CYGWIN__) || defined(__MINGW32__) -# undef HAVE_ALIAS +#undef HAVE_ALIAS #endif #ifdef HAVE_ALIAS -# define ALIAS2(from,to) \ - int __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \ +#define ALIAS2(from,to) \ + GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \ __attribute__ ((alias( # to ))); -# define ALIAS(from,to) ALIAS2( from, __glX ## to ## ReqSize ) +#define ALIAS(from,to) ALIAS2( from, __glX ## to ## ReqSize ) #else -# define ALIAS(from,to) \ - int __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \ +#define ALIAS(from,to) \ + GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \ { return __glX ## to ## ReqSize( pc, swap ); } #endif @@ -703,7 +703,7 @@ __glXPointParameterfvEXTReqSize(const GLbyte *pc, Bool swap) int __glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap) { - GLuint num = *(GLuint *) (pc + 8); + GLsizei num = *(GLsizei *) (pc + 8); if (swap) { num = bswap_32(num); @@ -715,7 +715,7 @@ __glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap) int __glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap) { - GLuint num = *(GLuint *) (pc + 8); + GLsizei num = *(GLsizei *) (pc + 8); if (swap) { num = bswap_32(num); |