On Mon, 2005-08-01 at 09:37 -0700, Ian Romanick wrote: > It builds fine on my main machine. I tried a build on a fresh system > install (with X.org CVS installed) and hit the same problem. I > committed a fix for it just a few minutes ago. I think the problem here > is related to the next problem... > > > And, even with that change, the s3v and savage drivers did not compile, > > both failed the same way (though I didn't care too much as I only needed > > r200 anyway...). > > gcc -c -I. -I../../../../../src/mesa/drivers/dri/common -Iserver > > -I../../../../../../dri/drm/shared-core -I../../../../../include > > -I../../../../../include/GL/internal -I../../../../../src/mesa > > -I../../../../../src/mesa/main -I../../../../../src/mesa/glapi > > -I../../../../../src/mesa/math -I../../../../../src/mesa/transform > > -I../../../../../src/mesa/shader -I../../../../../src/mesa/swrast > > -I../../../../../src/mesa/swrast_setup -I../../../../../src/egl/main > > -I../dri_client -I../dri_client/imports -Wall -O -g -m32 > > -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE > > -D_GNU_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER > > -DGLX_DIRECT_RENDERING -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM > > -DUSE_SSE_ASM -std=c99 -ffast-math -D_POSIX_SOURCE > > -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE > > -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER > > -DGLX_DIRECT_RENDERING s3v_state.c -o s3v_state.o > > In file included from ../../../../../src/mesa/main/mtypes.h:41, > > from s3v_screen.h:5, > > from s3v_context.h:13, > > from s3v_state.c:6: > > ../../../../../src/mesa/glapi/glthread.h:202: error: conflicting types > > for `_glthread_TSD' > > ../../../../../src/mesa/glapi/glthread.h:92: error: previous declaration > > of `_glthread_TSD' > > The only way this could happen is if *both* PTHREADS and XTHREADS are > defined. I suspect the Xthreads.h problem was always there, but it was > never hit because XTHREADS was never defined. Some how, somewhere, > XTHREADS is getting set. I'll have to look into it, but I think this is > a bug in whatever X.org header is defining XTHREADS for us. :(
Yes, you're spot on about PTHREADS and XTHREADS both being defined. XlibConf.h now defines XTHREADS if we're using it, the consensus being that if you're using <X11/Xlibint.h>, you deserve everything you get. I think this already got fixed, so the constructs are more like: #if defined(PTHREADS) ... #elif defined(XTHREADS) ... #elif defined(...) ... #endif ------------------------------------------------------- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf -- _______________________________________________ Dri-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/dri-devel
