Import of XFree86 4.1.99.1X_4_1_99_1

21 files changed, 401 insertions, 310 deletions

diff --git a/xc/extras/Mesa/include/GL/osmesa.h b/xc/extras/Mesa/include/GL/osmesa.h
index c3bc43d0c..3f1b863ea 100644
--- a/xc/extras/Mesa/include/GL/osmesa.h
+++ b/xc/extras/Mesa/include/GL/osmesa.h
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 
-#include "GL/gl.h"
+#include <GL/gl.h>
 
 
 #define OSMESA_MAJOR_VERSION 3
diff --git a/xc/extras/Mesa/src/X/xmesa1.c b/xc/extras/Mesa/src/X/xmesa1.c
index 847cb2613..bf3c7521d 100644
--- a/xc/extras/Mesa/src/X/xmesa1.c
+++ b/xc/extras/Mesa/src/X/xmesa1.c
@@ -1,4 +1,3 @@
-/* $Id: xmesa1.c,v 1.1.1.12 2001/06/14 21:52:51 dawes Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/common_x86.c b/xc/extras/Mesa/src/X86/common_x86.c
index 872c54515..162b1941f 100644
--- a/xc/extras/Mesa/src/X86/common_x86.c
+++ b/xc/extras/Mesa/src/X86/common_x86.c
@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#if defined(USE_KATMAI_ASM) && defined(__linux__) && defined(_POSIX_SOURCE)
+#if defined(USE_KATMAI_ASM) && defined(__linux__)
 #include <signal.h>
 #endif
 
@@ -87,7 +87,7 @@ static void message( const char *msg )
 extern void gl_test_os_katmai_support( void );
 extern void gl_test_os_katmai_exception_support( void );
 
-#if defined(__linux__) && defined(_POSIX_SOURCE)
+#if defined(__linux__) && defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC)
 static void sigill_handler( int signal, struct sigcontext sc )
 {
    message( "SIGILL, " );
@@ -125,7 +125,7 @@ static void sigfpe_handler( int signal, struct sigcontext sc )
       gl_problem( NULL, "SSE enabling test failed badly!" );
    }
 }
-#endif /* __linux__ && _POSIX_SOURCE */
+#endif /* __linux__ && _POSIX_SOURCE && X86_FXSR_MAGIC */
 
 /* If we're running on a processor that can do SSE, let's see if we
  * are allowed to or not.  This will catch 2.4.0 or later kernels that
@@ -138,7 +138,7 @@ static void sigfpe_handler( int signal, struct sigcontext sc )
 static void check_os_katmai_support( void )
 {
 #if defined(__linux__)
-#if defined(_POSIX_SOURCE)
+#if defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC)
    struct sigaction saved_sigill;
    struct sigaction saved_sigfpe;
 
@@ -212,7 +212,7 @@ static void check_os_katmai_support( void )
     */
    message( "Cannot test OS support for SSE, disabling to be safe.\n" );
    gl_x86_cpu_features &= ~(X86_FEATURE_XMM);
-#endif /* _POSIX_SOURCE */
+#endif /* _POSIX_SOURCE && X86_FXSR_MAGIC */
 #else
    /* Do nothing on non-Linux platforms for now.
     */
diff --git a/xc/extras/Mesa/src/dlist.c b/xc/extras/Mesa/src/dlist.c
index ff23ee951..fc0c6e22d 100644
--- a/xc/extras/Mesa/src/dlist.c
+++ b/xc/extras/Mesa/src/dlist.c
@@ -1152,7 +1152,7 @@ save_CopyColorSubTable(GLenum target, GLsizei start,
    Node *n;
 
    FLUSH_VB(ctx, "dlist");
-   n = alloc_instruction( ctx, OPCODE_COPY_COLOR_SUB_TABLE, 6 );
+   n = alloc_instruction( ctx, OPCODE_COPY_COLOR_SUB_TABLE, 5 );
    if (n) {
       n[1].e = target;
       n[2].i = start;
@@ -1174,7 +1174,7 @@ save_CopyColorTable(GLenum target, GLenum internalformat,
    Node *n;
 
    FLUSH_VB(ctx, "dlist");
-   n = alloc_instruction( ctx, OPCODE_COPY_COLOR_TABLE, 6 );
+   n = alloc_instruction( ctx, OPCODE_COPY_COLOR_TABLE, 5 );
    if (n) {
       n[1].e = target;
       n[2].e = internalformat;
@@ -1316,7 +1316,7 @@ save_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
    GET_CURRENT_CONTEXT(ctx);
    Node *n;
    FLUSH_VB(ctx, "dlist");
-   n = alloc_instruction( ctx, OPCODE_CONVOLUTION_PARAMETER_IV, 6 );
+   n = alloc_instruction( ctx, OPCODE_CONVOLUTION_PARAMETER_FV, 6 );
    if (n) {
       n[1].e = target;
       n[2].e = pname;
@@ -3669,7 +3669,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
          return;
       }
       MEMCPY(image, data, imageSize);
-      n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_IMAGE_1D, 8 );
+      n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_IMAGE_1D, 7 );
       if (n) {
          n[1].e = target;
          n[2].i = level;
@@ -3713,7 +3713,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
          return;
       }
       MEMCPY(image, data, imageSize);
-      n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_IMAGE_2D, 9 );
+      n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_IMAGE_2D, 8 );
       if (n) {
          n[1].e = target;
          n[2].i = level;
@@ -3758,7 +3758,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
          return;
       }
       MEMCPY(image, data, imageSize);
-      n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_IMAGE_3D, 10 );
+      n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_IMAGE_3D, 9 );
       if (n) {
          n[1].e = target;
          n[2].i = level;
@@ -3799,7 +3799,7 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
       return;
    }
    MEMCPY(image, data, imageSize);
-   n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D, 8 );
+   n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D, 7 );
    if (n) {
       n[1].e = target;
       n[2].i = level;
@@ -3838,7 +3838,7 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
       return;
    }
    MEMCPY(image, data, imageSize);
-   n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D, 10 );
+   n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D, 9 );
    if (n) {
       n[1].e = target;
       n[2].i = level;
@@ -3879,7 +3879,7 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
       return;
    }
    MEMCPY(image, data, imageSize);
-   n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D, 12 );
+   n = alloc_instruction( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D, 11 );
    if (n) {
       n[1].e = target;
       n[2].i = level;
@@ -5660,11 +5660,22 @@ static void print_list( GLcontext *ctx, FILE *f, GLuint list )
             fprintf(f,"Error: %s %s\n", enum_string(n[1].e), (const char *)n[2].data );
             break;
 	 case OPCODE_VERTEX_CASSETTE:
-            fprintf(f,"VERTEX-CASSETTE, id %u, rows %u..%u\n", 
-		    ((struct immediate *) n[1].data)->id,
-		    n[2].ui,
-		    n[3].ui);
-	    gl_print_cassette( (struct immediate *) n[1].data );
+            {
+               struct immediate *IM; 
+               fprintf(f,"VERTEX-CASSETTE, id %u, rows %u..%u\n", 
+                       ((struct immediate *) n[1].data)->id,
+                       n[2].ui,
+                       n[3].ui);
+               IM = (struct immediate *) n[1].data; 
+               IM->Start = n[2].ui; 
+               IM->Count = n[3].ui; 
+               IM->BeginState = n[4].ui; 
+               IM->OrFlag = n[5].ui; 
+               IM->AndFlag = n[6].ui; 
+               IM->LastData = n[7].ui; 
+               IM->LastPrimitive = n[8].ui; 
+               gl_print_cassette( (struct immediate *) n[1].data );
+            }
 	    break;
 	 case OPCODE_CONTINUE:
             fprintf(f,"DISPLAY-LIST-CONTINUE\n");
diff --git a/xc/extras/Mesa/src/enums.c b/xc/extras/Mesa/src/enums.c
index bc93f61dc..b304d2e00 100644
--- a/xc/extras/Mesa/src/enums.c
+++ b/xc/extras/Mesa/src/enums.c
@@ -862,6 +862,9 @@ static void sort_enums( void )
    index1 = (enum_elt **)MALLOC( Elements(all_enums) * sizeof(enum_elt *) );
    sorted = 1;
 
+   if (!index1)
+      return;  /* what else can we do? */
+
    qsort( all_enums, Elements(all_enums), sizeof(*all_enums),
 	  (cfunc) compar_name );
 
diff --git a/xc/extras/Mesa/src/lines.c b/xc/extras/Mesa/src/lines.c
index ffbbad416..57e968aa9 100644
--- a/xc/extras/Mesa/src/lines.c
+++ b/xc/extras/Mesa/src/lines.c
@@ -968,6 +968,23 @@ static void aa_multitex_rgba_line( GLcontext *ctx,
                                    GLuint vert0, GLuint vert1, GLuint pvert )
 {
 #define INTERP_RGBA 1
+#define INTERP_STUV0 1
+#define INTERP_STUV1 1
+#define PLOT(x, y)							\
+   {									\
+      PB_WRITE_MULTITEX_PIXEL( pb, (x), (y), z,				\
+            red, green, blue, coverage,					\
+            s, t, u, s1, t1, u1 );					\
+   }
+#include "lnaatemp.h"
+}
+
+
+/* As above but with separate specular */
+static void aa_multitex_spec_line( GLcontext *ctx,
+                                   GLuint vert0, GLuint vert1, GLuint pvert )
+{
+#define INTERP_RGBA 1
 #define INTERP_SPEC 1
 #define INTERP_STUV0 1
 #define INTERP_STUV1 1
@@ -1052,6 +1069,8 @@ _mesa_print_line_function(GLcontext *ctx)
       printf("aa_tex_rgba_line\n");
    else if (ctx->Driver.LineFunc == aa_multitex_rgba_line)
       printf("aa_multitex_rgba_line\n");
+   else if (ctx->Driver.LineFunc == aa_multitex_spec_line)
+      printf("aa_multitex_spec_line\n");
    else if (ctx->Driver.LineFunc == aa_ci_line)
       printf("aa_ci_line\n");
    else if (ctx->Driver.LineFunc == null_line)
@@ -1086,12 +1105,16 @@ void gl_set_line_function( GLcontext *ctx )
          /* antialiased lines */
          if (rgbmode) {
             if (ctx->Texture.ReallyEnabled) {
-               if (ctx->Texture.ReallyEnabled >= TEXTURE1_1D
-                  || ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR)
+               if (ctx->Texture.ReallyEnabled >= TEXTURE1_1D) {
                   /* Multitextured! */
-                  ctx->Driver.LineFunc = aa_multitex_rgba_line;
-               else
+                  if (ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR)
+                     ctx->Driver.LineFunc = aa_multitex_spec_line;
+                  else
+                     ctx->Driver.LineFunc = aa_multitex_rgba_line;
+               }
+               else {
                   ctx->Driver.LineFunc = aa_tex_rgba_line;
+               }
             } else {
                ctx->Driver.LineFunc = aa_rgba_line;
             }
diff --git a/xc/extras/Mesa/src/macros.h b/xc/extras/Mesa/src/macros.h
index e61db9efa..279ac3220 100644
--- a/xc/extras/Mesa/src/macros.h
+++ b/xc/extras/Mesa/src/macros.h
@@ -355,18 +355,22 @@ do {						\
 /*
  * Copy a vector of 4 GLubytes from SRC to DST.
  */
+#if defined(__i386__)
 #define COPY_4UBV(DST, SRC)			\
 do {						\
-   if (sizeof(GLuint)==4*sizeof(GLubyte)) {	\
-      *((GLuint*)(DST)) = *((GLuint*)(SRC));	\
-   }						\
-   else {					\
-      (DST)[0] = (SRC)[0];			\
-      (DST)[1] = (SRC)[1];			\
-      (DST)[2] = (SRC)[2];			\
-      (DST)[3] = (SRC)[3];			\
-   }						\
+   *((GLuint*)(DST)) = *((GLuint*)(SRC));	\
 } while (0)
+#else
+/* The GLuint cast might fail if DST or SRC are not dword-aligned (RISC) */
+#define COPY_4UBV(DST, SRC)			\
+do {						\
+   (DST)[0] = (SRC)[0];				\
+   (DST)[1] = (SRC)[1];				\
+   (DST)[2] = (SRC)[2];				\
+   (DST)[3] = (SRC)[3];				\
+} while (0)
+#endif
+
 
 
 /* Assign scalers to short vectors: */
diff --git a/xc/extras/Mesa/src/mmath.h b/xc/extras/Mesa/src/mmath.h
index b737c8036..a45465462 100644
--- a/xc/extras/Mesa/src/mmath.h
+++ b/xc/extras/Mesa/src/mmath.h
@@ -232,8 +232,8 @@ do {						\
  * GLubyte b = FloatToInt(CLAMP(f, 0, 1) * 255)
  */
 
-#if defined(__i386__) || defined(__sparc__) || ( defined(__alpha__) && \
-	      ( defined( __IEEE_FLOAT ) || !defined( VMS ) ) )
+#if defined(__i386__) || defined(__sparc__) || defined(__s390x__) || \
+    ( defined(__alpha__) && ( defined( __IEEE_FLOAT ) || !defined( VMS ) ) )
 #define USE_IEEE
 #define IEEE_ONE 0x3f7f0000
 #endif
diff --git a/xc/extras/Mesa/src/pixel.c b/xc/extras/Mesa/src/pixel.c
index 7725f8ddb..d530b2971 100644
--- a/xc/extras/Mesa/src/pixel.c
+++ b/xc/extras/Mesa/src/pixel.c
@@ -721,10 +721,14 @@ _mesa_map_rgba( const GLcontext *ctx, GLuint n, GLfloat rgba[][4] )
    const GLfloat *aMap = ctx->Pixel.MapAtoA;
    GLuint i;
    for (i=0;i<n;i++) {
-      rgba[i][RCOMP] = rMap[(GLint) (rgba[i][RCOMP] * rscale + 0.5F)];
-      rgba[i][GCOMP] = gMap[(GLint) (rgba[i][GCOMP] * gscale + 0.5F)];
-      rgba[i][BCOMP] = bMap[(GLint) (rgba[i][BCOMP] * bscale + 0.5F)];
-      rgba[i][ACOMP] = aMap[(GLint) (rgba[i][ACOMP] * ascale + 0.5F)];
+      GLfloat r = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
+      GLfloat g = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
+      GLfloat b = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
+      GLfloat a = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
+      rgba[i][RCOMP] = rMap[(GLint) (r * rscale + 0.5F)];
+      rgba[i][GCOMP] = gMap[(GLint) (g * gscale + 0.5F)];
+      rgba[i][BCOMP] = bMap[(GLint) (b * bscale + 0.5F)];
+      rgba[i][ACOMP] = aMap[(GLint) (a * ascale + 0.5F)];
    }
 }
 
@@ -773,24 +777,26 @@ _mesa_lookup_rgba(const struct gl_color_table *table,
       case GL_INTENSITY:
          /* replace RGBA with I */
          if (table->TableType == GL_UNSIGNED_BYTE) {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLubyte *lut = (const GLubyte *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
                GLint j = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
-               GLfloat c = lut[j] * (1.0F / 255.0F);
+               GLfloat c = lut[CLAMP(j, 0, max)] * (1.0F / 255.0F);
                rgba[i][RCOMP] = rgba[i][GCOMP] =
                   rgba[i][BCOMP] = rgba[i][ACOMP] = c;
             }
 
          }
          else {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLfloat *lut = (const GLfloat *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
                GLint j = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
-               GLfloat c = lut[j];
+               GLfloat c = lut[CLAMP(j, 0, max)];
                rgba[i][RCOMP] = rgba[i][GCOMP] =
                   rgba[i][BCOMP] = rgba[i][ACOMP] = c;
             }
@@ -799,22 +805,24 @@ _mesa_lookup_rgba(const struct gl_color_table *table,
       case GL_LUMINANCE:
          /* replace RGB with L */
          if (table->TableType == GL_UNSIGNED_BYTE) {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLubyte *lut = (const GLubyte *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
                GLint j = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
-               GLfloat c = lut[j] * (1.0F / 255.0F);
+               GLfloat c = lut[CLAMP(j, 0, max)] * (1.0F / 255.0F);
                rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = c;
             }
          }
          else {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLfloat *lut = (const GLfloat *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
                GLint j = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
-               GLfloat c = lut[j];
+               GLfloat c = lut[CLAMP(j, 0, max)];
                rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = c;
             }
          }
@@ -822,48 +830,58 @@ _mesa_lookup_rgba(const struct gl_color_table *table,
       case GL_ALPHA:
          /* replace A with A */
          if (table->TableType == GL_UNSIGNED_BYTE) {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLubyte *lut = (const GLubyte *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
                GLint j = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
-               rgba[i][ACOMP] = lut[j] * (1.0F / 255.0F);
+               rgba[i][ACOMP] = lut[CLAMP(j, 0, max)] * (1.0F / 255.0F);
             }
          }
          else  {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLfloat *lut = (const GLfloat *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
                GLint j = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
-               rgba[i][ACOMP] = lut[j];
+               rgba[i][ACOMP] = lut[CLAMP(j, 0, max)];
             }
          }
          break;
       case GL_LUMINANCE_ALPHA:
          /* replace RGBA with LLLA */
          if (table->TableType == GL_UNSIGNED_BYTE) {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLubyte *lut = (const GLubyte *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
                GLint jL = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
                GLint jA = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
-               GLfloat luminance = lut[jL * 2 + 0] * (1.0F / 255.0F);
-               GLfloat alpha     = lut[jA * 2 + 1] * (1.0F / 255.0F);
+               GLfloat luminance, alpha;
+               jL = CLAMP(jL, 0, max);
+               jA = CLAMP(jA, 0, max);
+               luminance = lut[jL * 2 + 0] * (1.0F / 255.0F);
+               alpha     = lut[jA * 2 + 1] * (1.0F / 255.0F);
                rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = luminance;
                rgba[i][ACOMP] = alpha;;
             }
          }
          else {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLfloat *lut = (const GLfloat *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
                GLint jL = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
                GLint jA = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
-               GLfloat luminance = lut[jL * 2 + 0];
-               GLfloat alpha     = lut[jA * 2 + 1];
+               GLfloat luminance, alpha;
+               jL = CLAMP(jL, 0, max);
+               jA = CLAMP(jA, 0, max);
+               luminance = lut[jL * 2 + 0];
+               alpha     = lut[jA * 2 + 1];
                rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = luminance;
                rgba[i][ACOMP] = alpha;;
             }
@@ -872,26 +890,34 @@ _mesa_lookup_rgba(const struct gl_color_table *table,
       case GL_RGB:
          /* replace RGB with RGB */
          if (table->TableType == GL_UNSIGNED_BYTE) {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLubyte *lut = (const GLubyte *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
                GLint jR = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
                GLint jG = (GLint) (rgba[i][GCOMP] * scale + 0.5F);
                GLint jB = (GLint) (rgba[i][BCOMP] * scale + 0.5F);
+               jR = CLAMP(jR, 0, max);
+               jG = CLAMP(jG, 0, max);
+               jB = CLAMP(jB, 0, max);
                rgba[i][RCOMP] = lut[jR * 3 + 0] * (1.0F / 255.0F);
                rgba[i][GCOMP] = lut[jG * 3 + 1] * (1.0F / 255.0F);
                rgba[i][BCOMP] = lut[jB * 3 + 2] * (1.0F / 255.0F);
             }
          }
          else {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLfloat *lut = (const GLfloat *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
                GLint jR = (GLint) (rgba[i][RCOMP] * scale + 0.5F);
                GLint jG = (GLint) (rgba[i][GCOMP] * scale + 0.5F);
                GLint jB = (GLint) (rgba[i][BCOMP] * scale + 0.5F);
+               jR = CLAMP(jR, 0, max);
+               jG = CLAMP(jG, 0, max);
+               jB = CLAMP(jB, 0, max);
                rgba[i][RCOMP] = lut[jR * 3 + 0];
                rgba[i][GCOMP] = lut[jG * 3 + 1];
                rgba[i][BCOMP] = lut[jB * 3 + 2];
@@ -901,7 +927,8 @@ _mesa_lookup_rgba(const struct gl_color_table *table,
       case GL_RGBA:
          /* replace RGBA with RGBA */
          if (table->TableType == GL_UNSIGNED_BYTE) {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLubyte *lut = (const GLubyte *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
@@ -909,6 +936,10 @@ _mesa_lookup_rgba(const struct gl_color_table *table,
                GLint jG = (GLint) (rgba[i][GCOMP] * scale + 0.5F);
                GLint jB = (GLint) (rgba[i][BCOMP] * scale + 0.5F);
                GLint jA = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
+               jR = CLAMP(jR, 0, max);
+               jG = CLAMP(jG, 0, max);
+               jB = CLAMP(jB, 0, max);
+               jA = CLAMP(jA, 0, max);
                rgba[i][RCOMP] = lut[jR * 4 + 0] * (1.0F / 255.0F);
                rgba[i][GCOMP] = lut[jG * 4 + 1] * (1.0F / 255.0F);
                rgba[i][BCOMP] = lut[jB * 4 + 2] * (1.0F / 255.0F);
@@ -916,7 +947,8 @@ _mesa_lookup_rgba(const struct gl_color_table *table,
             }
          }
          else {
-            const GLfloat scale = (GLfloat) (table->Size - 1);
+            const GLint max = table->Size - 1;
+            const GLfloat scale = (GLfloat) max;
             const GLfloat *lut = (const GLfloat *) table->Table;
             GLuint i;
             for (i = 0; i < n; i++) {
@@ -924,6 +956,10 @@ _mesa_lookup_rgba(const struct gl_color_table *table,
                GLint jG = (GLint) (rgba[i][GCOMP] * scale + 0.5F);
                GLint jB = (GLint) (rgba[i][BCOMP] * scale + 0.5F);
                GLint jA = (GLint) (rgba[i][ACOMP] * scale + 0.5F);
+               jR = CLAMP(jR, 0, max);
+               jG = CLAMP(jG, 0, max);
+               jB = CLAMP(jB, 0, max);
+               jA = CLAMP(jA, 0, max);
                rgba[i][RCOMP] = lut[jR * 4 + 0];
                rgba[i][GCOMP] = lut[jG * 4 + 1];
                rgba[i][BCOMP] = lut[jB * 4 + 2];
diff --git a/xc/extras/Mesa/src/texstate.c b/xc/extras/Mesa/src/texstate.c
index 95e64647d..49db51538 100644
--- a/xc/extras/Mesa/src/texstate.c
+++ b/xc/extras/Mesa/src/texstate.c
@@ -773,7 +773,7 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
 
 
 void
-_mesa_TexParameteri( GLenum target, GLenum pname, const GLint param )
+_mesa_TexParameteri( GLenum target, GLenum pname, GLint param )
 {
    GLfloat fparam[4];
    fparam[0] = (GLfloat) param;
diff --git a/xc/extras/Mesa/src/xform_tmp.h b/xc/extras/Mesa/src/xform_tmp.h
index 258dca1f3..261548a4f 100644
--- a/xc/extras/Mesa/src/xform_tmp.h
+++ b/xc/extras/Mesa/src/xform_tmp.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/extras/Mesa/src/xform_tmp.h,v 1.7 2001/04/01 13:59:57 tsi Exp $ */
+
 /*
  * Mesa 3-D graphics library
  * Version:  3.1
diff --git a/xc/extras/X-TrueType/xttcap.h b/xc/extras/X-TrueType/xttcap.h
index 48754c1cb..f379f442e 100644
--- a/xc/extras/X-TrueType/xttcap.h
+++ b/xc/extras/X-TrueType/xttcap.h
@@ -29,10 +29,13 @@
 
 Notice===
  */
+/* $XFree86: xc/extras/X-TrueType/xttcap.h,v 1.2 2001/08/01 00:44:33 tsi Exp $ */
 
 #ifndef _XTTCAP_H_
 #define _XTTCAP_H_ (1)
 
+#include <X11/Xdefs.h>
+
 /*******************************************************************
   Data Types
  */
diff --git a/xc/extras/X-TrueType/xttcconvP.h b/xc/extras/X-TrueType/xttcconvP.h
index 514039e5e..b881f20ad 100644
--- a/xc/extras/X-TrueType/xttcconvP.h
+++ b/xc/extras/X-TrueType/xttcconvP.h
@@ -32,11 +32,12 @@
 
 Notice===
  */
-/* $XFree86: xc/extras/X-TrueType/xttcconvP.h,v 1.7 2001/03/06 18:03:12 dawes Exp $ */
+/* $XFree86: xc/extras/X-TrueType/xttcconvP.h,v 1.8 2001/08/01 00:44:33 tsi Exp $ */
 
 #ifndef _XTTCCONVP_H_
 #define _XTTCCONVP_H_ 1
 
+#include <X11/Xdefs.h>
 
 /*************************************
   Data Types
diff --git a/xc/extras/X-TrueType/xttcommon.h b/xc/extras/X-TrueType/xttcommon.h
index 5ebe00f08..ff158dd65 100644
--- a/xc/extras/X-TrueType/xttcommon.h
+++ b/xc/extras/X-TrueType/xttcommon.h
@@ -31,7 +31,7 @@
 
 Notice===
 */
-/* $XFree86: xc/extras/X-TrueType/xttcommon.h,v 1.7 2000/02/18 12:18:49 tsi Exp $ */
+/* $XFree86: xc/extras/X-TrueType/xttcommon.h,v 1.8 2001/08/01 00:44:33 tsi Exp $ */
 
 #ifndef _XTTCOMMON_H_
 #define _XTTCOMMON_H_ (1)
@@ -83,15 +83,14 @@ Notice===
 # include <X11/X.h>
 # include <X11/Xmd.h>
 # include <X11/Xfuncproto.h>
-# ifdef FONTMODULE
-/* for New Designed XFree86 font module */
-#  include "xf86Module.h"
-# endif
+# include "xf86Module.h"
 # include "fontmisc.h"
 # include "xf86_ansic.h"
 
 #endif
 
+#include <X11/Xdefs.h>
+
 #include <freetype.h>
 #include <ftxsbit.h>
 
diff --git a/xc/extras/X-TrueType/xttstruct.h b/xc/extras/X-TrueType/xttstruct.h
index 7be5dbead..c9a26b63f 100644
--- a/xc/extras/X-TrueType/xttstruct.h
+++ b/xc/extras/X-TrueType/xttstruct.h
@@ -30,10 +30,12 @@
 
 Notice===
 */
+/* $XFree86: xc/extras/X-TrueType/xttstruct.h,v 1.2 2001/08/01 00:44:33 tsi Exp $ */
 
 #ifndef _XTTSTRUCT_H_
 #define _XTTSTRUCT_H_
 
+#define _FONTCACHE_SERVER_
 #include "fontcache.h"
 
 
diff --git a/xc/extras/Xpm/cxpm/cxpm.c b/xc/extras/Xpm/cxpm/cxpm.c
index c99db177c..20b490531 100644
--- a/xc/extras/Xpm/cxpm/cxpm.c
+++ b/xc/extras/Xpm/cxpm/cxpm.c
@@ -22,6 +22,7 @@
  * used in advertising or otherwise to promote the sale, use or other dealings
  * in this Software without prior written authorization from Arnaud LE HORS.
  */
+/* $XFree86: xc/extras/Xpm/cxpm/cxpm.c,v 1.2 2001/08/01 00:44:34 tsi Exp $ */
 
 /*****************************************************************************\
 * cxpm.c:                                                                     *
@@ -117,6 +118,7 @@ ErrorMessage(ErrorStatus, data)
     }
 }
 
+int
 main(argc, argv)
     int argc;
     char **argv;
diff --git a/xc/extras/Xpm/lib/XpmI.h b/xc/extras/Xpm/lib/XpmI.h
index a82a31241..1d29448ef 100644
--- a/xc/extras/Xpm/lib/XpmI.h
+++ b/xc/extras/Xpm/lib/XpmI.h
@@ -22,7 +22,7 @@
  * used in advertising or otherwise to promote the sale, use or other dealings
  * in this Software without prior written authorization from GROUPE BULL.
  */
-/* $XFree86: xc/extras/Xpm/lib/XpmI.h,v 1.4 2000/09/26 15:56:42 tsi Exp $ */
+/* $XFree86: xc/extras/Xpm/lib/XpmI.h,v 1.5 2001/07/24 08:32:53 alanh Exp $ */
 
 /*****************************************************************************\
 * XpmI.h:                                                                     *
@@ -84,7 +84,7 @@ extern FILE *popen();
 
 /* the following is defined in X11R6 but not in previous versions */
 #if defined(__alpha) || defined(__alpha__) || \
-    defined(ia64) || defined(__ia64__)
+    defined(ia64) || defined(__ia64__) || defined(__s390x__)
 #ifndef LONG64
 #define LONG64
 #endif
diff --git a/xc/extras/Xpm/sxpm/sxpm.c b/xc/extras/Xpm/sxpm/sxpm.c
index 693e9e160..d8962723d 100644
--- a/xc/extras/Xpm/sxpm/sxpm.c
+++ b/xc/extras/Xpm/sxpm/sxpm.c
@@ -22,6 +22,7 @@
  * used in advertising or otherwise to promote the sale, use or other dealings
  * in this Software without prior written authorization from GROUPE BULL.
  */
+/* $XFree86: xc/extras/Xpm/sxpm/sxpm.c,v 1.2 2001/08/01 00:44:34 tsi Exp $ */
 
 /*****************************************************************************\
 * sxpm.c:                                                                     *
@@ -126,6 +127,7 @@ static XrmOptionDescRec options[] = {
     {"-icon", ".icon", XrmoptionSepArg, (XtPointer) NULL},
 };
 
+int
 main(argc, argv)
     int argc;
     char **argv;
@@ -549,6 +551,9 @@ main(argc, argv)
 	XtMainLoop();
     }
     Punt(0);
+
+    /* Muffle gcc */
+    return 0;
 }
 
 void
diff --git a/xc/extras/fonts/ClearlyU/cu12.bdf b/xc/extras/fonts/ClearlyU/cu12.bdf
index b608cff03..a8eebe70d 100644
--- a/xc/extras/fonts/ClearlyU/cu12.bdf
+++ b/xc/extras/fonts/ClearlyU/cu12.bdf
@@ -25,10 +25,12 @@ COMMENT OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY CLAIM, DAMAGES
 COMMENT OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 COMMENT OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 COMMENT SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+COMMENT
+COMMENT $XFree86: xc/extras/fonts/ClearlyU/cu12.bdf,v 1.5 2001/08/20 20:55:27 dawes Exp $
 COMMENT 
 FONT -MUTT-ClearlyU-Medium-R-Normal--17-120-100-100-P-128-ISO10646-1
 SIZE 12 100 100
-FONTBOUNDINGBOX 27 30 -6 -10
+FONTBOUNDINGBOX 28 30 -7 -10
 STARTPROPERTIES 21
 FONT_ASCENT 20
 FONT_DESCENT 9
@@ -25921,14 +25923,14 @@ BITMAP
 88
 70
 ENDCHAR
-STARTCHAR 00A1
+STARTCHAR 0x0E01
 ENCODING 3585
 SWIDTH 480 0
 DWIDTH 8 0
 BBX 7 9 1 0
 BITMAP
 7C
-86
+82
 42
 82
 82
@@ -25937,7 +25939,7 @@ BITMAP
 82
 82
 ENDCHAR
-STARTCHAR 00A2
+STARTCHAR 0x0E02
 ENCODING 3586
 SWIDTH 540 0
 DWIDTH 9 0
@@ -25953,7 +25955,7 @@ A9
 11
 3F
 ENDCHAR
-STARTCHAR 00A3
+STARTCHAR 0x0E03
 ENCODING 3587
 SWIDTH 600 0
 DWIDTH 10 0
@@ -25969,14 +25971,14 @@ A880
 0880
 1F80
 ENDCHAR
-STARTCHAR 00A4
+STARTCHAR 0x0E04
 ENCODING 3588
 SWIDTH 540 0
 DWIDTH 9 0
 BBX 8 9 1 0
 BITMAP
 7E
-83
+81
 81
 B1
 E9
@@ -25985,7 +25987,7 @@ E9
 41
 41
 ENDCHAR
-STARTCHAR 00A4
+STARTCHAR 0x0E05
 ENCODING 3589
 SWIDTH 540 0
 DWIDTH 9 0
@@ -26001,7 +26003,7 @@ E9
 41
 41
 ENDCHAR
-STARTCHAR 00A6
+STARTCHAR 0x0E06
 ENCODING 3590
 SWIDTH 660 0
 DWIDTH 11 0
@@ -26017,7 +26019,7 @@ A840
 28C0
 1840
 ENDCHAR
-STARTCHAR 00A7
+STARTCHAR 0x0E07
 ENCODING 3591
 SWIDTH 420 0
 DWIDTH 7 0
@@ -26033,14 +26035,14 @@ BITMAP
 14
 0C
 ENDCHAR
-STARTCHAR 00A8
+STARTCHAR 0x0E08
 ENCODING 3592
 SWIDTH 480 0
 DWIDTH 8 0
 BBX 7 9 1 0
 BITMAP
 7C
-86
+82
 02
 1A
 2E
@@ -26049,14 +26051,14 @@ BITMAP
 02
 02
 ENDCHAR
-STARTCHAR 00A9
+STARTCHAR 0x0E09
 ENCODING 3593
 SWIDTH 600 0
 DWIDTH 10 0
 BBX 9 9 1 0
 BITMAP
 3C00
-4600
+4200
 0200
 4200
 A200
@@ -26065,7 +26067,7 @@ A200
 3280
 2100
 ENDCHAR
-STARTCHAR 00AA
+STARTCHAR 0x0E0A
 ENCODING 3594
 SWIDTH 600 0
 DWIDTH 10 0
@@ -26081,7 +26083,7 @@ AA00
 1100
 3F00
 ENDCHAR
-STARTCHAR 00AB
+STARTCHAR 0x0E0B
 ENCODING 3595
 SWIDTH 660 0
 DWIDTH 11 0
@@ -26097,7 +26099,7 @@ A880
 0880
 1F80
 ENDCHAR
-STARTCHAR 00AC
+STARTCHAR 0x0E0C
 ENCODING 3596
 SWIDTH 660 0
 DWIDTH 11 0
@@ -26110,10 +26112,10 @@ BITMAP
 8440
 8440
 CF40
-ACC0
+B4C0
 4840
 ENDCHAR
-STARTCHAR 00AD
+STARTCHAR 0x0E0D
 ENCODING 3597
 SWIDTH 660 0
 DWIDTH 11 0
@@ -26133,7 +26135,7 @@ A440
 0A40
 0780
 ENDCHAR
-STARTCHAR 00AE
+STARTCHAR 0x0E0E
 ENCODING 3598
 SWIDTH 600 0
 DWIDTH 10 0
@@ -26154,7 +26156,7 @@ A080
 3180
 0080
 ENDCHAR
-STARTCHAR 00AF
+STARTCHAR 0x0E0F
 ENCODING 3599
 SWIDTH 600 0
 DWIDTH 10 0
@@ -26175,7 +26177,7 @@ A080
 3580
 0080
 ENDCHAR
-STARTCHAR 00B0
+STARTCHAR 0x0E10
 ENCODING 3600
 SWIDTH 540 0
 DWIDTH 9 0
@@ -26196,7 +26198,7 @@ BITMAP
 AA
 D4
 ENDCHAR
-STARTCHAR 00B1
+STARTCHAR 0x0E11
 ENCODING 3601
 SWIDTH 660 0
 DWIDTH 11 0
@@ -26212,7 +26214,7 @@ AA40
 0840
 0840
 ENDCHAR
-STARTCHAR 00B2
+STARTCHAR 0x0E12
 ENCODING 3602
 SWIDTH 780 0
 DWIDTH 13 0
@@ -26228,7 +26230,7 @@ A910
 6530
 6310
 ENDCHAR
-STARTCHAR 00B3
+STARTCHAR 0x0E13
 ENCODING 3603
 SWIDTH 780 0
 DWIDTH 13 0
@@ -26244,23 +26246,23 @@ C550
 A650
 4460
 ENDCHAR
-STARTCHAR 00B4
+STARTCHAR 0x0E14
 ENCODING 3604
 SWIDTH 540 0
 DWIDTH 9 0
 BBX 8 9 1 0
 BITMAP
-3E
-43
+3C
+42
 91
 A9
 99
-B1
+91
 61
 41
 41
 ENDCHAR
-STARTCHAR 00B5
+STARTCHAR 0x0E15
 ENCODING 3605
 SWIDTH 600 0
 DWIDTH 10 0
@@ -26276,14 +26278,14 @@ B1
 41
 41
 ENDCHAR
-STARTCHAR 00B6
+STARTCHAR 0x0E16
 ENCODING 3606
 SWIDTH 480 0
 DWIDTH 8 0
 BBX 7 9 1 0
 BITMAP
 7C
-86
+82
 42
 82
 82
@@ -26292,7 +26294,7 @@ C2
 A2
 42
 ENDCHAR
-STARTCHAR 00B7
+STARTCHAR 0x0E17
 ENCODING 3607
 SWIDTH 540 0
 DWIDTH 9 0
@@ -26308,7 +26310,7 @@ A5
 21
 21
 ENDCHAR
-STARTCHAR 00B8
+STARTCHAR 0x0E18
 ENCODING 3608
 SWIDTH 480 0
 DWIDTH 8 0
@@ -26324,7 +26326,7 @@ F0
 24
 7C
 ENDCHAR
-STARTCHAR 00B9
+STARTCHAR 0x0E19
 ENCODING 3609
 SWIDTH 660 0
 DWIDTH 11 0
@@ -26340,7 +26342,7 @@ A100
 3140
 2180
 ENDCHAR
-STARTCHAR 00BA
+STARTCHAR 0x0E1A
 ENCODING 3610
 SWIDTH 600 0
 DWIDTH 10 0
@@ -26356,7 +26358,7 @@ A080
 2080
 7F80
 ENDCHAR
-STARTCHAR 00BB
+STARTCHAR 0x0E1B
 ENCODING 3611
 SWIDTH 600 0
 DWIDTH 10 0
@@ -26376,7 +26378,7 @@ A080
 2080
 7F80
 ENDCHAR
-STARTCHAR 00BC
+STARTCHAR 0x0E1C
 ENCODING 3612
 SWIDTH 480 0
 DWIDTH 8 0
@@ -26392,7 +26394,7 @@ C6
 82
 82
 ENDCHAR
-STARTCHAR 00BD
+STARTCHAR 0x0E1D
 ENCODING 3613
 SWIDTH 480 0
 DWIDTH 8 0
@@ -26412,7 +26414,7 @@ C6
 82
 82
 ENDCHAR
-STARTCHAR 00BE
+STARTCHAR 0x0E1E
 ENCODING 3614
 SWIDTH 660 0
 DWIDTH 11 0
@@ -26428,7 +26430,7 @@ A640
 2040
 2040
 ENDCHAR
-STARTCHAR 00BF
+STARTCHAR 0x0E1F
 ENCODING 3615
 SWIDTH 660 0
 DWIDTH 11 0
@@ -26448,14 +26450,14 @@ A640
 2040
 2040
 ENDCHAR
-STARTCHAR 00C0
+STARTCHAR 0x0E20
 ENCODING 3616
 SWIDTH 600 0
 DWIDTH 10 0
 BBX 9 9 1 0
 BITMAP
 1F00
-2180
+2080
 1080
 2080
 2080
@@ -26464,7 +26466,7 @@ BITMAP
 A080
 4080
 ENDCHAR
-STARTCHAR 00C1
+STARTCHAR 0x0E21
 ENCODING 3617
 SWIDTH 540 0
 DWIDTH 9 0
@@ -26480,7 +26482,7 @@ A5
 A3
 61
 ENDCHAR
-STARTCHAR 00C2
+STARTCHAR 0x0E22
 ENCODING 3618
 SWIDTH 480 0
 DWIDTH 8 0
@@ -26496,7 +26498,7 @@ A2
 82
 FC
 ENDCHAR
-STARTCHAR 00C3
+STARTCHAR 0x0E23
 ENCODING 3619
 SWIDTH 480 0
 DWIDTH 8 0
@@ -26512,14 +26514,14 @@ F0
 14
 08
 ENDCHAR
-STARTCHAR 00C4
+STARTCHAR 0x0E24
 ENCODING 3620
 SWIDTH 480 0
 DWIDTH 8 0
 BBX 7 14 1 -5
 BITMAP
 7C
-86
+82
 42
 82
 82
@@ -26533,14 +26535,14 @@ A2
 02
 02
 ENDCHAR
-STARTCHAR 00C5
+STARTCHAR 0x0E25
 ENCODING 3621
 SWIDTH 540 0
 DWIDTH 9 0
 BBX 7 9 2 0
 BITMAP
 7C
-86
+82
 02
 72
 8A
@@ -26549,14 +26551,14 @@ C6
 A2
 42
 ENDCHAR
-STARTCHAR 00C6
+STARTCHAR 0x0E26
 ENCODING 3622
 SWIDTH 600 0
 DWIDTH 10 0
 BBX 9 14 1 -5
 BITMAP
 1F00
-2180
+2080
 1080
 2080
 2080
@@ -26570,14 +26572,14 @@ A080
 0080
 0080
 ENDCHAR
-STARTCHAR 00C7
+STARTCHAR 0x0E27
 ENCODING 3623
 SWIDTH 480 0
 DWIDTH 8 0
 BBX 7 9 1 0
 BITMAP
 7C
-86
+82
 02
 02
 02
@@ -26586,7 +26588,7 @@ BITMAP
 0A
 04
 ENDCHAR
-STARTCHAR 00A4
+STARTCHAR 0x0E28
 ENCODING 3624
 SWIDTH 540 0
 DWIDTH 9 0
@@ -26603,7 +26605,7 @@ E9
 41
 41
 ENDCHAR
-STARTCHAR 00C9
+STARTCHAR 0x0E29
 ENCODING 3625
 SWIDTH 660 0
 DWIDTH 11 0
@@ -26619,7 +26621,7 @@ A100
 2100
 7F00
 ENDCHAR
-STARTCHAR 00CA
+STARTCHAR 0x0E2A
 ENCODING 3626
 SWIDTH 480 0
 DWIDTH 8 0
@@ -26636,7 +26638,7 @@ E6
 92
 62
 ENDCHAR
-STARTCHAR 00CB
+STARTCHAR 0x0E2B
 ENCODING 3627
 SWIDTH 540 0
 DWIDTH 9 0
@@ -26652,7 +26654,7 @@ A5
 21
 21
 ENDCHAR
-STARTCHAR 00CC
+STARTCHAR 0x0E2C
 ENCODING 3628
 SWIDTH 660 0
 DWIDTH 11 0
@@ -26669,14 +26671,14 @@ A6C0
 2040
 2040
 ENDCHAR
-STARTCHAR 00CD
+STARTCHAR 0x0E2D
 ENCODING 3629
 SWIDTH 540 0
 DWIDTH 9 0
 BBX 7 9 2 0
 BITMAP
 7C
-86
+82
 02
 42
 A2
@@ -26685,7 +26687,7 @@ C2
 82
 FE
 ENDCHAR
-STARTCHAR 00CE
+STARTCHAR 0x0E2E
 ENCODING 3630
 SWIDTH 540 0
 DWIDTH 9 0
@@ -26701,7 +26703,7 @@ C2
 82
 7E
 ENDCHAR
-STARTCHAR 00CF
+STARTCHAR 0x0E2F
 ENCODING 3631
 SWIDTH 480 0
 DWIDTH 8 0
@@ -26717,7 +26719,7 @@ C6
 06
 18
 ENDCHAR
-STARTCHAR 00D0
+STARTCHAR 0x0E30
 ENCODING 3632
 SWIDTH 420 0
 DWIDTH 7 0
@@ -26733,25 +26735,25 @@ A4
 C4
 78
 ENDCHAR
-STARTCHAR 00D1
+STARTCHAR 0x0E31
 ENCODING 3633
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 6 4 0 10
+BBX 6 4 -5 10
 BITMAP
 40
 A4
 C4
 78
 ENDCHAR
-STARTCHAR 00D2
+STARTCHAR 0x0E32
 ENCODING 3634
 SWIDTH 480 0
 DWIDTH 8 0
 BBX 7 9 1 0
 BITMAP
 7C
-86
+82
 02
 02
 02
@@ -26760,7 +26762,7 @@ BITMAP
 02
 02
 ENDCHAR
-STARTCHAR 00D3
+STARTCHAR 0x0E33
 ENCODING 3635
 SWIDTH 480 0
 DWIDTH 8 0
@@ -26773,7 +26775,7 @@ A000
 0000
 0000
 07C0
-0860
+0820
 0020
 0020
 0020
@@ -26782,22 +26784,22 @@ A000
 0020
 0020
 ENDCHAR
-STARTCHAR 00D4
+STARTCHAR 0x0E34
 ENCODING 3636
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 7 4 0 9
+BBX 7 4 -7 9
 BITMAP
 38
 44
 FE
 02
 ENDCHAR
-STARTCHAR 00D5
+STARTCHAR 0x0E35
 ENCODING 3637
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 7 5 0 9
+BBX 7 5 -7 9
 BITMAP
 02
 3A
@@ -26805,11 +26807,11 @@ BITMAP
 FE
 02
 ENDCHAR
-STARTCHAR 00D6
+STARTCHAR 0x0E36
 ENCODING 3638
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 7 5 0 9
+BBX 7 5 -7 9
 BITMAP
 06
 3A
@@ -26817,11 +26819,11 @@ BITMAP
 FE
 02
 ENDCHAR
-STARTCHAR 00D7
+STARTCHAR 0x0E37
 ENCODING 3639
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 7 5 0 9
+BBX 7 5 -7 9
 BITMAP
 0A
 3A
@@ -26829,11 +26831,11 @@ BITMAP
 FE
 02
 ENDCHAR
-STARTCHAR 00D8
+STARTCHAR 0x0E38
 ENCODING 3640
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 3 6 0 -7
+BBX 3 6 -3 -7
 BITMAP
 40
 A0
@@ -26842,11 +26844,11 @@ A0
 20
 20
 ENDCHAR
-STARTCHAR 00D9
+STARTCHAR 0x0E39
 ENCODING 3641
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 6 6 0 -7
+BBX 6 6 -6 -7
 BITMAP
 44
 A4
@@ -26855,34 +26857,36 @@ A4
 24
 18
 ENDCHAR
-STARTCHAR char3642
+STARTCHAR 0x0E3A
 ENCODING 3642
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 2 2 0 -3
+BBX 2 2 -2 -3
 BITMAP
 C0
 C0
 ENDCHAR
-STARTCHAR C066
+STARTCHAR 0x0E3F
 ENCODING 3647
-SWIDTH 720 0
-DWIDTH 12 0
-BBX 11 11 1 0
+SWIDTH 660 0
+DWIDTH 11 0
+BBX 8 13 3 -1
 BITMAP
-3F20
-10C0
-10C0
-1140
-1280
-1F00
-1880
-1040
-3040
-5080
-BF00
+08
+FC
+4B
+49
+49
+4A
+7C
+4A
+49
+49
+4A
+FC
+08
 ENDCHAR
-STARTCHAR 00E0
+STARTCHAR 0x0E40
 ENCODING 3648
 SWIDTH 240 0
 DWIDTH 4 0
@@ -26898,7 +26902,7 @@ C0
 A0
 40
 ENDCHAR
-STARTCHAR 00E1
+STARTCHAR 0x0E41
 ENCODING 3649
 SWIDTH 480 0
 DWIDTH 8 0
@@ -26914,86 +26918,86 @@ CC
 AA
 44
 ENDCHAR
-STARTCHAR 00E2
+STARTCHAR 0x0E42
 ENCODING 3650
-SWIDTH 360 0
-DWIDTH 6 0
-BBX 5 17 1 0
+SWIDTH 420 0
+DWIDTH 7 0
+BBX 7 17 0 0
 BITMAP
-F0
-98
-40
-20
-20
-20
-20
-20
-20
-20
-20
-20
-20
-20
-30
-28
+78
+86
+60
+10
+10
+10
+10
+10
+10
 10
+10
+10
+10
+10
+18
+14
+08
 ENDCHAR
-STARTCHAR 00E3
+STARTCHAR 0x0E43
 ENCODING 3651
 SWIDTH 360 0
 DWIDTH 6 0
-BBX 5 17 1 0
+BBX 6 17 0 0
 BITMAP
-40
-A0
 60
-20
-20
-20
-20
-20
-20
-20
-20
-20
-20
-20
-30
-28
+90
+90
+50
+10
+10
+10
+10
+10
+10
+10
 10
+10
+10
+18
+14
+08
 ENDCHAR
-STARTCHAR 00E4
+STARTCHAR 0x0E44
 ENCODING 3652
-SWIDTH 420 0
-DWIDTH 7 0
-BBX 7 17 1 0
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 17 0 0
 BITMAP
-18
-98
-A8
-68
-48
-08
-08
-08
-08
-08
-08
-08
-08
-08
-0C
-0A
+84
+4C
+54
+24
+24
+04
+04
+04
+04
 04
+04
+04
+04
+04
+06
+05
+02
 ENDCHAR
-STARTCHAR 00E5
+STARTCHAR 0x0E45
 ENCODING 3653
 SWIDTH 480 0
 DWIDTH 8 0
 BBX 7 14 1 -5
 BITMAP
 7C
-86
+82
 02
 02
 02
@@ -27007,7 +27011,7 @@ BITMAP
 02
 02
 ENDCHAR
-STARTCHAR 00E6
+STARTCHAR 0x0E46
 ENCODING 3654
 SWIDTH 480 0
 DWIDTH 8 0
@@ -27027,11 +27031,11 @@ A2
 04
 18
 ENDCHAR
-STARTCHAR 00E7
+STARTCHAR 0x0E47
 ENCODING 3655
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 6 5 0 10
+BBX 6 5 -7 10
 BITMAP
 04
 78
@@ -27039,83 +27043,83 @@ BITMAP
 F4
 18
 ENDCHAR
-STARTCHAR char3656
+STARTCHAR 0x0E48
 ENCODING 3656
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 1 3 0 10
+BBX 1 3 -1 14
 BITMAP
 80
 80
 80
 ENDCHAR
-STARTCHAR 00E9
+STARTCHAR 0x0E49
 ENCODING 3657
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 6 4 0 10
+BBX 6 4 -5 14
 BITMAP
 40
 A4
 44
 F8
 ENDCHAR
-STARTCHAR 00EA
+STARTCHAR 0x0E4A
 ENCODING 3658
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 9 4 0 10
+BBX 9 4 -7 14
 BITMAP
 6C00
 9280
 D300
 D600
 ENDCHAR
-STARTCHAR 00EB
+STARTCHAR 0x0E4B
 ENCODING 3659
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 3 3 0 10
+BBX 3 3 -3 14
 BITMAP
 40
 E0
 40
 ENDCHAR
-STARTCHAR 00EC
+STARTCHAR 0x0E4C
 ENCODING 3660
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 4 4 0 10
+BBX 4 4 -3 14
 BITMAP
 10
 60
 A0
 40
 ENDCHAR
-STARTCHAR 00ED
+STARTCHAR 0x0E4D
 ENCODING 3661
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 3 4 0 10
+BBX 3 4 -3 14
 BITMAP
 40
 A0
 A0
 40
 ENDCHAR
-STARTCHAR 00EE
+STARTCHAR 0x0E4E
 ENCODING 3662
 SWIDTH 0 0
 DWIDTH 0 0
-BBX 3 5 0 10
+BBX 4 5 -3 10
 BITMAP
-60
-80
+30
+40
 60
 80
 60
 ENDCHAR
-STARTCHAR 00EF
+STARTCHAR 0x0E4F
 ENCODING 3663
 SWIDTH 540 0
 DWIDTH 9 0
@@ -27124,13 +27128,13 @@ BITMAP
 3C
 42
 99
-BD
-BD
+A5
+A5
 99
 42
 3C
 ENDCHAR
-STARTCHAR 00F0
+STARTCHAR 0x0E50
 ENCODING 3664
 SWIDTH 540 0
 DWIDTH 9 0
@@ -27144,7 +27148,7 @@ BITMAP
 42
 3C
 ENDCHAR
-STARTCHAR 00F1
+STARTCHAR 0x0E51
 ENCODING 3665
 SWIDTH 540 0
 DWIDTH 9 0
@@ -27152,14 +27156,14 @@ BBX 8 8 1 -1
 BITMAP
 3C
 42
-89
-95
-8D
-C5
-79
-02
+91
+A9
+99
+49
+32
+04
 ENDCHAR
-STARTCHAR 00F2
+STARTCHAR 0x0E52
 ENCODING 3666
 SWIDTH 660 0
 DWIDTH 11 0
@@ -27176,21 +27180,21 @@ C000
 4040
 3F80
 ENDCHAR
-STARTCHAR 00F3
+STARTCHAR 0x0E53
 ENCODING 3667
 SWIDTH 600 0
 DWIDTH 10 0
 BBX 9 7 1 0
 BITMAP
 7700
-8980
+8880
 8880
 8880
 C880
 A880
 4900
 ENDCHAR
-STARTCHAR 00F4
+STARTCHAR 0x0E54
 ENCODING 3668
 SWIDTH 720 0
 DWIDTH 12 0
@@ -27198,7 +27202,7 @@ BBX 11 11 1 0
 BITMAP
 0020
 0020
-0060
+0020
 0040
 3F80
 4000
@@ -27208,14 +27212,14 @@ BITMAP
 4700
 3FC0
 ENDCHAR
-STARTCHAR 00F5
+STARTCHAR 0x0E55
 ENCODING 3669
 SWIDTH 720 0
 DWIDTH 12 0
 BBX 11 10 1 0
 BITMAP
 0820
-1460
+1420
 1C40
 3F80
 4000
@@ -27225,7 +27229,7 @@ BITMAP
 4E00
 3FC0
 ENDCHAR
-STARTCHAR 00F6
+STARTCHAR 0x0E56
 ENCODING 3670
 SWIDTH 480 0
 DWIDTH 8 0
@@ -27243,7 +27247,7 @@ BITMAP
 54
 38
 ENDCHAR
-STARTCHAR 00F7
+STARTCHAR 0x0E57
 ENCODING 3671
 SWIDTH 720 0
 DWIDTH 12 0
@@ -27254,14 +27258,14 @@ BITMAP
 0040
 0040
 7640
-D940
+8940
 8940
 8140
 A140
-D280
+D180
 6300
 ENDCHAR
-STARTCHAR 00F8
+STARTCHAR 0x0E58
 ENCODING 3672
 SWIDTH 660 0
 DWIDTH 11 0
@@ -27270,7 +27274,7 @@ BITMAP
 0040
 0040
 0040
-3CC0
+3C40
 4380
 8100
 B280
@@ -27278,7 +27282,7 @@ A980
 6480
 2300
 ENDCHAR
-STARTCHAR 00F9
+STARTCHAR 0x0E59
 ENCODING 3673
 SWIDTH 600 0
 DWIDTH 10 0
@@ -27289,48 +27293,46 @@ BITMAP
 0080
 0080
 7280
-CD80
+8D80
+8400
 8400
-8600
 9200
 A900
 7100
 ENDCHAR
-STARTCHAR 00CF
+STARTCHAR 0x0E5A
 ENCODING 3674
 SWIDTH 540 0
 DWIDTH 9 0
-BBX 8 11 1 -2
+BBX 8 9 1 0
 BITMAP
-42
-A2
-C6
-8A
-72
-02
-02
-02
-02
-01
-06
+45
+A5
+CD
+95
+65
+05
+05
+05
+0A
 ENDCHAR
-STARTCHAR char3675
+STARTCHAR 0x0E5B
 ENCODING 3675
 SWIDTH 840 0
 DWIDTH 14 0
 BBX 13 11 1 0
 BITMAP
-6000
-9000
-A018
-8930
-8920
-8920
-8920
-8920
-8920
-D6A0
-7240
+2000
+5000
+8800
+8A80
+9AB8
+AAA0
+AAC0
+9B00
+8200
+4400
+3800
 ENDCHAR
 STARTCHAR 0064
 ENCODING 3713
diff --git a/xc/extras/freetype2/include/freetype/internal/ftdebug.h b/xc/extras/freetype2/include/freetype/internal/ftdebug.h
index db905ed3e..f83967d44 100644
--- a/xc/extras/freetype2/include/freetype/internal/ftdebug.h
+++ b/xc/extras/freetype2/include/freetype/internal/ftdebug.h
@@ -14,7 +14,7 @@
 /*  understand and accept it fully.                                        */
 /*                                                                         */
 /***************************************************************************/
-
+/* $XFree86: xc/extras/freetype2/include/freetype/internal/ftdebug.h,v 1.2 2001/08/01 00:44:34 tsi Exp $ */
 
 #ifndef __FTDEBUG_H__
 #define __FTDEBUG_H__
@@ -181,7 +181,7 @@ FT_BEGIN_HEADER
 #if defined( FT_DEBUG_LEVEL_TRACE ) || defined( FT_DEBUG_LEVEL_ERROR )
 
 
-#include "stdio.h"  /* for vprintf() */
+#include <stdio.h>  /* for vprintf() */
 
 
 #define FT_Assert( condition )                                      \
diff --git a/xc/extras/rman/getopt.c b/xc/extras/rman/getopt.c
index b5e8403ef..f69071607 100644
--- a/xc/extras/rman/getopt.c
+++ b/xc/extras/rman/getopt.c
@@ -9,16 +9,17 @@ UNIFORUM conference in Dallas.  I obtained it by electronic mail
 directly from AT&T.  The people there assure me that it is indeed
 in the public domain.
 */
+/* $XFree86: xc/extras/rman/getopt.c,v 1.3 2001/07/29 05:01:10 tsi Exp $ */
 
 /*LINTLIBRARY*/
 
-extern int strlen();
-extern int strcmp();
-extern char *strchr();
-extern int write();
+#include <stdlib.h>
+#include <unistd.h>
+#include <stddef.h>
 
-#define NULL	0
+#ifndef EOF
 #define EOF	(-1)
+#endif
 #define ERR(s, c)	if(opterr){\
 	char errbuf[2];\
 	errbuf[0] = c; errbuf[1] = '\n';\