mesa 7.6.1_0 FTB on Tiger: conflicting types in glx_empty.c

[gale@…]

This happens on Tiger Intel. If you find that it does not occur on other platforms, please change "FTB" to "FTB on Tiger" in the Summary. Thanks.

/usr/bin/gcc-4.0 -I. -Iinclude -Iinclude/internal -I/opt/local/include -I/opt/local/include -Wall -ggdb3 -Os -DPTHREADS -D_REENTRANT -DGLX_USE_APPLEGL -DGLX_ALIAS_UNSUPPORTED  -I/opt/local/include -I/opt/local/var/macports/sources/rsync.macports.org/release/ports/x11/mesa/files/include -O2 -arch i386 -c glx_empty.c
glx_empty.c:40: error: conflicting types for 'glXBeginFrameTrackingMESA'
include/GL/glx.h:409: error: previous declaration of 'glXBeginFrameTrackingMESA' was here
glx_empty.c:50: error: conflicting types for 'glXEndFrameTrackingMESA'
include/GL/glx.h:410: error: previous declaration of 'glXEndFrameTrackingMESA' was here
glx_empty.c:60: error: conflicting types for 'glXGetFrameUsageMESA'
include/GL/glx.h:408: error: previous declaration of 'glXGetFrameUsageMESA' was here
glx_empty.c:72: error: conflicting types for 'glXQueryFrameTrackingMESA'
include/GL/glx.h:411: error: previous declaration of 'glXQueryFrameTrackingMESA' was here
make: *** [glx_empty.o] Error 1

Error: Unable to upgrade port: 1

[gale@…]

In glx.h these four functions return an int, but in glx_empty.c they return a GLint.

Note, however, that GL/gl.h contains:

typedef int GLint; /* 4-byte signed */

[gale@…]

Change return type of the four functions from GLint to int in glx_empty.c

[jeremyhu (Jeremy Huddleston Sequoia)]

r62147