Finish off XFree86 4.0.1h mergeX_4_0_1h-20001205-merge

15 files changed, 22 insertions, 21 deletions

diff --git a/xc/extras/Mesa/include/GL/gl.h b/xc/extras/Mesa/include/GL/gl.h
index 11e67c6f3..5a31ddebd 100644
--- a/xc/extras/Mesa/include/GL/gl.h
+++ b/xc/extras/Mesa/include/GL/gl.h
@@ -22,6 +22,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+/* $XFree86: xc/extras/Mesa/include/GL/gl.h,v 1.7 2000/09/24 13:50:05 alanh Exp $ */
 
 
 #ifndef __gl_h_
@@ -43,11 +44,11 @@
 #define OPENSTEP
 #endif
 
-#if defined(_WIN32) && !defined(__WIN32__)
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
 #define __WIN32__
 #endif
 
-#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__))
+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
 #  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
 #    define GLAPI __declspec(dllexport)
 #  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
@@ -62,7 +63,7 @@
 #  define GLAPIENTRY
 #endif /* WIN32 / CYGWIN bracket */
 
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(__CYGWIN__) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
 #include <gl/mesa_wgl.h>
 #endif
 
diff --git a/xc/extras/Mesa/src/colortab.c b/xc/extras/Mesa/src/colortab.c
index bd137ee7a..d4bb469e1 100644
--- a/xc/extras/Mesa/src/colortab.c
+++ b/xc/extras/Mesa/src/colortab.c
@@ -1,4 +1,3 @@
-/* $Id: colortab.c,v 1.15 2000/11/21 23:06:58 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/glheader.h b/xc/extras/Mesa/src/glheader.h
index 714ecfe61..f47f268bc 100644
--- a/xc/extras/Mesa/src/glheader.h
+++ b/xc/extras/Mesa/src/glheader.h
@@ -83,11 +83,11 @@
  * the new src/glheader.h file.
  */
 
-#if defined(_WIN32) && !defined(__WIN32__)
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
 #	define __WIN32__
 #endif
 
-#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__))
+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
 #  pragma warning( disable : 4068 ) /* unknown pragma */
 #  pragma warning( disable : 4710 ) /* function 'foo' not inlined */
 #  pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
@@ -134,7 +134,7 @@
 
 /* compatability guard so we don't need to change client code */
 
-#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP)
+#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) && !defined(__CYGWIN__)
 #if 0
 #	define CALLBACK GLCALLBACK
 typedef void *HGLRC;
@@ -164,8 +164,10 @@ typedef unsigned long COLORREF;
 typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
 typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
 typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
+#if 0
 #include <gl/mesa_wgl.h>
 #endif
+#endif
 
 
 
diff --git a/xc/extras/Mesa/src/imaging.c b/xc/extras/Mesa/src/imaging.c
index 5bdeb49f0..c6d7d9bdf 100644
--- a/xc/extras/Mesa/src/imaging.c
+++ b/xc/extras/Mesa/src/imaging.c
@@ -1,4 +1,3 @@
-/* $Id: imaging.c,v 1.11 2000/11/21 23:06:58 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/mmath.h b/xc/extras/Mesa/src/mmath.h
index fc34fcb08..dae66eac6 100644
--- a/xc/extras/Mesa/src/mmath.h
+++ b/xc/extras/Mesa/src/mmath.h
@@ -22,7 +22,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-
+/* $XFree86: xc/extras/Mesa/src/mmath.h,v 1.7 2000/09/24 13:50:14 alanh Exp $ */
 
 /*
  * Faster arithmetic functions.  If the FAST_MATH preprocessor symbol is
@@ -158,7 +158,7 @@ static __inline__ int FloatToInt(float f)
    __asm__ ("fistpl %0" : "=m" (r) : "t" (f) : "st");
    return r;
 }
-#elif  defined(__MSC__) && defined(__WIN32__)
+#elif  defined(__MSC__) && defined(__WIN32__) && !defined(__CYGWIN__)
 static __inline int FloatToInt(float f)
 {
    int r;
diff --git a/xc/extras/Mesa/src/readpix.c b/xc/extras/Mesa/src/readpix.c
index 1695bb2db..96df972cd 100644
--- a/xc/extras/Mesa/src/readpix.c
+++ b/xc/extras/Mesa/src/readpix.c
@@ -1,4 +1,3 @@
-/* $Id: readpix.c,v 1.14 2000/11/21 18:01:52 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/stencil.c b/xc/extras/Mesa/src/stencil.c
index 7c86d976c..74e03af38 100644
--- a/xc/extras/Mesa/src/stencil.c
+++ b/xc/extras/Mesa/src/stencil.c
@@ -1,4 +1,3 @@
-/* $Id: stencil.c,v 1.8 2000/11/28 21:40:39 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/texobj.c b/xc/extras/Mesa/src/texobj.c
index 65d96457c..d568eadd7 100644
--- a/xc/extras/Mesa/src/texobj.c
+++ b/xc/extras/Mesa/src/texobj.c
@@ -1,4 +1,3 @@
-/* $Id: texobj.c,v 1.17 2000/12/05 19:51:30 dawes Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/varray.c b/xc/extras/Mesa/src/varray.c
index 39c07cc7c..7398a4b72 100644
--- a/xc/extras/Mesa/src/varray.c
+++ b/xc/extras/Mesa/src/varray.c
@@ -1,4 +1,3 @@
-/* $Id: varray.c,v 1.15 2000/12/05 19:51:30 dawes Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_eltpath.c b/xc/lib/GL/mesa/src/drv/r128/r128_eltpath.c
index 1c8c333e3..c02196ef9 100644
--- a/xc/lib/GL/mesa/src/drv/r128/r128_eltpath.c
+++ b/xc/lib/GL/mesa/src/drv/r128/r128_eltpath.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_eltpath.c,v 1.1 2000/12/04 19:21:46 dawes Exp $ */
 /*
  * GLX Hardware Device Driver for Matrox G400
  * Copyright (C) 1999 Keith Whitwell
diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_elttmp.h b/xc/lib/GL/mesa/src/drv/r128/r128_elttmp.h
index 12c615b73..ba82a261f 100644
--- a/xc/lib/GL/mesa/src/drv/r128/r128_elttmp.h
+++ b/xc/lib/GL/mesa/src/drv/r128/r128_elttmp.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_elttmp.h,v 1.1 2000/12/04 19:21:46 dawes Exp $ */
 /*
  * DRI Hardware Device Driver for G200/G400
  * Copyright (C) 1999 Keith Whitwell
diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c b/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c
index 44952b22d..067beff4e 100644
--- a/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c
+++ b/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_cce.c,v 1.3 2000/08/25 13:42:27 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c,v 1.1 2000/12/04 19:21:46 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h b/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h
index 333e67541..43b77659b 100644
--- a/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h
+++ b/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h,v 1.1 2000/12/04 19:21:46 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_lock.c b/xc/lib/GL/mesa/src/drv/r128/r128_lock.c
index 5d1d737b2..6c9331c74 100644
--- a/xc/lib/GL/mesa/src/drv/r128/r128_lock.c
+++ b/xc/lib/GL/mesa/src/drv/r128/r128_lock.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_lock.c,v 1.1 2000/12/04 19:21:46 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c
index 0bd954516..a7e3c71cf 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c
@@ -1,3 +1,5 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c,v 1.2 2000/12/02 15:30:57 tsi Exp $ */
+
 /* Adapted from ../mga/mga_video.c */
 
 #include "xf86.h"
@@ -334,7 +336,7 @@ YUVPlanarToPacked (ScrnInfoPtr pScrn,
   /* psrc points to the base of the Y plane, move out to src_x, src_y */
   psrc += src_x + src_y * width;
 
-  pdst = pTDFX->MMIOBase[0] + YUV_Y_BASE;
+  pdst = (char *)pTDFX->MMIOBase[0] + YUV_Y_BASE;
   for (y = 0; y < height; y++)
   {   
     memcpy (pdst, psrc, src_w);
@@ -349,7 +351,7 @@ YUVPlanarToPacked (ScrnInfoPtr pScrn,
    * different and we handle it in the the way we pick the source
    * format later on. */
 
-  pdst = pTDFX->MMIOBase[0] + YUV_V_BASE;
+  pdst = (char *)pTDFX->MMIOBase[0] + YUV_V_BASE;
   psrc = (char*)buf + width * height;
   /* psrc now points to the base of the V plane, move out to src_x, src_y */
   psrc += (src_x >> 1) + (src_y >> 1) * (width >> 1);
@@ -359,7 +361,7 @@ YUVPlanarToPacked (ScrnInfoPtr pScrn,
     psrc += width >> 1;
     pdst += 1024;
   }
-  pdst = pTDFX->MMIOBase[0] + YUV_U_BASE;
+  pdst = (char *)pTDFX->MMIOBase[0] + YUV_U_BASE;
   psrc = (char*)buf + width * height + (width >> 1) * (height >> 1);
   /* psrc now points to the base of the U plane, move out to src_x, src_y */
   psrc += (src_x >> 1) + (src_y >> 1) * (width >> 1);
@@ -413,7 +415,7 @@ TDFXPutImage(
      }
 
      YUVPlanarToPacked (pScrn, src_x, src_y, src_h, src_w,
-			id, buf, width, height,
+			id, (char *)buf, width, height,
 			fbarea);
      /* Don't know what executed last so we need to send a NOP */
      TDFXSendNOP(pScrn);