Clean up some warnings by making sis_fatal_error a macro, and let it take an

argument of a message to print.  Make some assert(0)s use sis_fatal_error.

1 files changed, 1 insertions, 9 deletions

diff --git a/src/mesa/drivers/dri/sis/sis_context.c b/src/mesa/drivers/dri/sis/sis_context.c
index cdf9257b5e..c49db5fe34 100644
--- a/src/mesa/drivers/dri/sis/sis_context.c
+++ b/src/mesa/drivers/dri/sis/sis_context.c
@@ -182,7 +182,7 @@ sisCreateContext( const __GLcontextModes *glVisual,
       smesa->colorFormat = DST_FORMAT_RGB_565;
       break;
    default:
-      assert (0);
+      sis_fatal_error("Bad bytesPerPixel.\n");
    }
 
    /* Parse configuration files */
@@ -508,11 +508,3 @@ sis_update_texture_state (sisContextPtr smesa)
    smesa->GlobalFlag &= ~GFLAG_TEXTURE_STATES;
 }
 
-void
-sis_fatal_error (void)
-{
-   /* free video memory, or the framebuffer device will do it automatically */
-
-   fprintf(stderr, "Fatal errors in sis_dri.so\n");
-   exit (-1);
-}