Failing to compile dispatch.c in programs/Xserver/GL/mesa/main...

This one looks like it is caused by the recent change to gl.h to include <stddef.h> in order to provide a definition for ptrdiff_t.

Unfortunatly, in whacky-xfree86-world, including headers like that will lead to trouble, and what's required is to include "xf86_libc.h" or nothing at all. I've included a patch for this...

But... unfortunately this means that we don't get the ptrdiff_t definition... So, that means that somewhere in maybe os-support/xf86_libc.h? we need something like:

# define ptrdiff_t int

The other option would be to change gl.h and glext.h to use int or GLint instead of ptrdiff_t...

Keith


Index: gl.h =================================================================== RCS file: /cvsroot/mesa3d/Mesa-newtree/include/GL/gl.h,v retrieving revision 1.94 diff -u -r1.94 gl.h --- gl.h 6 Dec 2003 01:49:54 -0000 1.94 +++ gl.h 8 Dec 2003 14:36:08 -0000 @@ -38,7 +38,9 @@ */ #if !defined(__SCITECH_SNAP__)

+#ifndef XFree86Server
 #include <stddef.h>     /* to get ptrdiff_t, used below */
+#endif

#if defined(__BEOS__)
#include <stdlib.h> /* to get some BeOS-isms */
Index: glext.h
===================================================================
RCS file: /cvsroot/mesa3d/Mesa-newtree/include/GL/glext.h,v
retrieving revision 1.53
diff -u -r1.53 glext.h
--- glext.h 30 Sep 2003 20:02:27 -0000 1.53
+++ glext.h 8 Dec 2003 14:36:09 -0000
@@ -3290,7 +3290,9 @@
#define GL_ARB_vertex_buffer_object 1
/* GL types for handling large vertex buffer objects */
/* Only used by this extension for now; later needs to be moved earlier in glext.h */
+#ifndef XFree86Server
#include <stddef.h>
+#endif
typedef ptrdiff_t GLintptrARB;
typedef ptrdiff_t GLsizeiptrARB;
#ifdef GL_GLEXT_PROTOTYPES




-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel

Reply via email to