diff options
Diffstat (limited to 'xc/extras/Mesa/src/config.c')
| -rw-r--r-- | xc/extras/Mesa/src/config.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/xc/extras/Mesa/src/config.c b/xc/extras/Mesa/src/config.c index 1834fd73e..e10642f48 100644 --- a/xc/extras/Mesa/src/config.c +++ b/xc/extras/Mesa/src/config.c @@ -1,8 +1,8 @@ -/* $Id: config.c,v 1.4 1999/12/18 16:51:05 daryll Exp $ */ +/* $Id: config.c,v 1.5 2000/01/30 00:27:01 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.1 + * Version: 3.3 * * Copyright (C) 1999 Brian Paul All Rights Reserved. * @@ -31,19 +31,19 @@ * to parse and potentially very expressive. */ -#ifndef XFree86Server -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> + +#ifdef PC_HEADER +#include "all.h" #else -#include "GL/xf86glx.h" -#endif -#include "enums.h" +#include "glheader.h" #include "config.h" -#include "types.h" +#include "enums.h" #include "extensions.h" -#include "simple_list.h" #include "glmisc.h" +#include "simple_list.h" +#include "mem.h" +#include "types.h" +#endif typedef enum { nil_t, list_t, word_t } node_type; @@ -229,7 +229,7 @@ static void default_hint( GLcontext *ctx, struct cnode *args ) (v = (GLenum) gl_lookup_enum_by_name(vname)) != -1) { printf("calling glHint(%s=%d, %s=%d)\n", hname, h, vname, v); - if (!gl_Hint( ctx, h, v )) + if (!_mesa_try_Hint( ctx, h, v )) error( hint, "glHint failed"); printf("allow draw mem: %d\n", ctx->Hint.AllowDrawMem); return; @@ -401,7 +401,7 @@ static void free_list( struct cnode *n ) */ void gl_read_config_file( GLcontext *ctx ) { - const char *default_config = "mesa3.1"; + const char *default_config = "mesa3.1beta1"; #if defined(__WIN32__) || defined(__MSDOS__) const char *filename = "mesa.cnf"; |