summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordok666 <dok666>2003-05-13 16:47:05 +0000
committerdok666 <dok666>2003-05-13 16:47:05 +0000
commitcc17359d5ba9f6121c5e9618e684f6ac9fd3039b (patch)
treecce9de290828e38f11df999cb34ea376fbe8da1c
parentb7b2485716383e4125ea5c1828c4488ff5bb0aff (diff)
Updated _mesa_problem() is required for the new driver.
-rw-r--r--src/mesa/main/imports.c15
-rw-r--r--src/mesa/main/imports.h4
2 files changed, 13 insertions, 6 deletions
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 392e3ece5a7..e3273df0159 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -45,7 +45,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $Id: imports.c,v 1.25.4.2 2003/03/20 12:56:57 jrfonseca Exp $ */
+/* $Id: imports.c,v 1.25.4.2.4.1 2003/05/13 16:47:05 dok666 Exp $ */
#include "glheader.h"
@@ -464,14 +464,21 @@ _mesa_warning( GLcontext *ctx, const char *fmtString, ... )
* Prints the message to stderr, either via fprintf() or xf86fprintf().
*/
void
-_mesa_problem( const GLcontext *ctx, const char *s )
+_mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
{
+ va_list args;
+ char str[MAXSTRING];
(void) ctx;
+
+ va_start( args, fmtString );
+ vsnprintf( str, MAXSTRING, fmtString, args );
+ va_end( args );
+
#if defined(XFree86LOADER) && defined(IN_MODULE)
- xf86fprintf(stderr, "Mesa implementation error: %s\n", s);
+ xf86fprintf(stderr, "Mesa implementation error: %s\n", str);
xf86fprintf(stderr, "Please report to the DRI project at dri.sourceforge.net\n");
#else
- fprintf(stderr, "Mesa implementation error: %s\n", s);
+ fprintf(stderr, "Mesa implementation error: %s\n", str);
fprintf(stderr, "Please report to the Mesa bug database at www.mesa3d.org\n" );
#endif
}
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index cc48047fcfc..ade90a10835 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -30,7 +30,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $Id: imports.h,v 1.8.4.1 2003/03/20 12:56:58 jrfonseca Exp $ */
+/* $Id: imports.h,v 1.8.4.1.4.1 2003/05/13 16:47:05 dok666 Exp $ */
#ifndef IMPORTS_H
@@ -241,7 +241,7 @@ extern void
_mesa_warning( __GLcontext *gc, const char *fmtString, ... );
extern void
-_mesa_problem( const __GLcontext *ctx, const char *s );
+_mesa_problem( const __GLcontext *ctx, const char *fmtString, ... );
extern void
_mesa_error( __GLcontext *ctx, GLenum error, const char *fmtString, ... );