lots of gl_*() to _mesa_*() namespace clean-up

4 files changed, 16 insertions, 16 deletions

diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index 6e73504ba5d..3bb27a0c536 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -1,4 +1,4 @@
-/* $Id: xfonts.c,v 1.11 2001/01/08 04:06:20 keithw Exp $ */
+/* $Id: xfonts.c,v 1.12 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -244,7 +244,7 @@ void Fake_glXUseXFont( Font font, int first, int count, int listbase )
 
   fs = XQueryFont (dpy, font);
   if (!fs) {
-      gl_error(NULL, GL_INVALID_VALUE,
+      _mesa_error(NULL, GL_INVALID_VALUE,
                "Couldn't get font structure information");
       return;
   }
@@ -259,7 +259,7 @@ void Fake_glXUseXFont( Font font, int first, int count, int listbase )
 (GLubyte));
   if (!bm) {
       XFreeFontInfo( NULL, fs, 0 );
-      gl_error(NULL, GL_OUT_OF_MEMORY,
+      _mesa_error(NULL, GL_OUT_OF_MEMORY,
                 "Couldn't allocate bitmap in glXUseXFont()");
       return;
   }
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 9ef37b54ddf..8e1bd87517e 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1,4 +1,4 @@
-/* $Id: xm_api.c,v 1.16 2001/01/23 23:39:37 brianp Exp $ */
+/* $Id: xm_api.c,v 1.17 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -431,7 +431,7 @@ static void free_xmesa_buffer(int client, XMesaBuffer buffer)
       prev = b;
    }
    /* buffer not found in XMesaBufferList */
-   gl_problem(NULL,"free_xmesa_buffer() - buffer not found\n");
+   _mesa_problem(NULL,"free_xmesa_buffer() - buffer not found\n");
 }
 
 
@@ -1410,7 +1410,7 @@ xmesa_color_to_pixel( XMesaContext xmesa, GLubyte r, GLubyte g, GLubyte b, GLuby
             return p;
          }
       default:
-         gl_problem(NULL, "Bad pixel format in xmesa_color_to_pixel");
+         _mesa_problem(NULL, "Bad pixel format in xmesa_color_to_pixel");
    }
    return 0;
 }
@@ -2630,7 +2630,7 @@ unsigned long XMesaDitherColor( XMesaContext xmesa, GLint x, GLint y,
             return p;
          }
       default:
-         gl_problem(NULL, "Bad pixel format in XMesaDitherColor");
+         _mesa_problem(NULL, "Bad pixel format in XMesaDitherColor");
    }
    return 0;
 }
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index a6108e00f7b..a73b3c69735 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -1,4 +1,4 @@
-/* $Id: xm_dd.c,v 1.17 2001/03/01 18:30:47 brianp Exp $ */
+/* $Id: xm_dd.c,v 1.18 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -215,7 +215,7 @@ set_read_buffer( GLcontext *ctx, GLframebuffer *buffer, GLenum mode )
       xmesa_update_span_funcs(ctx);
    }
    else {
-      gl_problem(ctx, "invalid buffer in set_read_buffer() in xmesa2.c");
+      _mesa_problem(ctx, "invalid buffer in set_read_buffer() in xmesa2.c");
    }
 }
 
diff --git a/src/mesa/drivers/x11/xm_span.c b/src/mesa/drivers/x11/xm_span.c
index a9269bfcbc2..e87fd98a8a5 100644
--- a/src/mesa/drivers/x11/xm_span.c
+++ b/src/mesa/drivers/x11/xm_span.c
@@ -1,4 +1,4 @@
-/* $Id: xm_span.c,v 1.9 2001/02/22 17:50:13 brianp Exp $ */
+/* $Id: xm_span.c,v 1.10 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -3685,7 +3685,7 @@ static void read_color_span( const GLcontext *ctx,
                }
 	       break;
 	    default:
-	       gl_problem(NULL,"Problem in DD.read_color_span (1)");
+	       _mesa_problem(NULL,"Problem in DD.read_color_span (1)");
                return;
 	 }
       }
@@ -3876,7 +3876,7 @@ static void read_color_span( const GLcontext *ctx,
 	    }
 	    break;
 	 default:
-	    gl_problem(NULL,"Problem in DD.read_color_span (2)");
+	    _mesa_problem(NULL,"Problem in DD.read_color_span (2)");
             return;
       }
    }
@@ -4051,7 +4051,7 @@ static void read_color_pixels( const GLcontext *ctx,
 	    }
 	    break;
 	 default:
-	    gl_problem(NULL,"Problem in DD.read_color_pixels (1)");
+	    _mesa_problem(NULL,"Problem in DD.read_color_pixels (1)");
             return;
       }
    }
@@ -4168,7 +4168,7 @@ static void read_color_pixels( const GLcontext *ctx,
 	    }
 	    break;
 	 default:
-	    gl_problem(NULL,"Problem in DD.read_color_pixels (1)");
+	    _mesa_problem(NULL,"Problem in DD.read_color_pixels (1)");
             return;
       }
    }
@@ -4338,7 +4338,7 @@ void xmesa_update_span_funcs( GLcontext *ctx )
             ctx->Driver.WriteMonoRGBAPixels = write_pixels_mono_pixmap;
             break;
 	 default:
-	    gl_problem(NULL,"Bad pixel format in xmesa_update_state (1)");
+	    _mesa_problem(NULL,"Bad pixel format in xmesa_update_state (1)");
             return;
       }
    }
@@ -4471,7 +4471,7 @@ void xmesa_update_span_funcs( GLcontext *ctx )
 	    }
 	    break;
 	 default:
-	    gl_problem(NULL,"Bad pixel format in xmesa_update_state (2)");
+	    _mesa_problem(NULL,"Bad pixel format in xmesa_update_state (2)");
             return;
       }
    }