From a391877234ba76a9b06026863e76be5acccd2b5d Mon Sep 17 00:00:00 2001
From: dawes <dawes>
Date: Tue, 10 Apr 2001 15:24:55 +0000
Subject: resolve some XFree86 vs DRI differences

---
 xc/lib/GL/mesa/src/drv/radeon/radeon_dd.c     | 6 +++---
 xc/lib/GL/mesa/src/drv/radeon/radeon_dd.h     | 2 +-
 xc/lib/GL/mesa/src/drv/radeon/radeon_vb.h     | 3 +--
 xc/programs/Xserver/GL/include/GL/glx_ansic.h | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/xc/lib/GL/mesa/src/drv/radeon/radeon_dd.c b/xc/lib/GL/mesa/src/drv/radeon/radeon_dd.c
index 7ff9cc548..f54d15a8e 100644
--- a/xc/lib/GL/mesa/src/drv/radeon/radeon_dd.c
+++ b/xc/lib/GL/mesa/src/drv/radeon/radeon_dd.c
@@ -67,11 +67,11 @@ static void radeonDDGetBufferSize( GLcontext *ctx,
 static const GLubyte *radeonDDGetString( GLcontext *ctx, GLenum name )
 {
    radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
-   static GLubyte buffer[128];
+   static char buffer[128];
 
    switch ( name ) {
    case GL_VENDOR:
-      return "VA Linux Systems, Inc.";
+      return (GLubyte *)"VA Linux Systems, Inc.";
 
    case GL_RENDERER:
       sprintf( buffer, "Mesa DRI Radeon " RADEON_DATE );
@@ -119,7 +119,7 @@ static const GLubyte *radeonDDGetString( GLcontext *ctx, GLenum name )
 	 strncat( buffer, "/SSE", 4 );
       }
 #endif
-      return buffer;
+      return (GLubyte *)buffer;
 
    default:
       return NULL;
diff --git a/xc/lib/GL/mesa/src/drv/radeon/radeon_dd.h b/xc/lib/GL/mesa/src/drv/radeon/radeon_dd.h
index 98dd22fae..5e16e5e62 100644
--- a/xc/lib/GL/mesa/src/drv/radeon/radeon_dd.h
+++ b/xc/lib/GL/mesa/src/drv/radeon/radeon_dd.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_dd.h,v 1.1 2001/01/08 01:07:26 martin Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
diff --git a/xc/lib/GL/mesa/src/drv/radeon/radeon_vb.h b/xc/lib/GL/mesa/src/drv/radeon/radeon_vb.h
index 82280414e..bd809efbb 100644
--- a/xc/lib/GL/mesa/src/drv/radeon/radeon_vb.h
+++ b/xc/lib/GL/mesa/src/drv/radeon/radeon_vb.h
@@ -1,5 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_vb.h,v 1.1 2001/01/08 01:07:2
-9 martin Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_vb.h,v 1.1 2001/01/08 01:07:29 martin Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
diff --git a/xc/programs/Xserver/GL/include/GL/glx_ansic.h b/xc/programs/Xserver/GL/include/GL/glx_ansic.h
index f420ddaf9..73820cd60 100644
--- a/xc/programs/Xserver/GL/include/GL/glx_ansic.h
+++ b/xc/programs/Xserver/GL/include/GL/glx_ansic.h
@@ -34,7 +34,6 @@
 ** was created using the OpenGL(R) version 1.2.1 Sample Implementation
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
 */
 
 /*
-- 
cgit v1.2.3