From 654dccfd856329bbb66f10d6096a206e33fa397a Mon Sep 17 00:00:00 2001 From: Daniel Borca Date: Wed, 15 Dec 2004 07:54:20 +0000 Subject: [PATCH] added DMesaProc type to prevent gcc 3.4.3 warnings. sw tc is disabled by default --- src/mesa/drivers/dos/dmesa.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dos/dmesa.c b/src/mesa/drivers/dos/dmesa.c index e0b2cf52b14..9688dd95b26 100644 --- a/src/mesa/drivers/dos/dmesa.c +++ b/src/mesa/drivers/dos/dmesa.c @@ -63,7 +63,7 @@ #include "GL/dmesa.h" -#define SWTC 1 /* SW texture compression */ +#define SWTC 0 /* SW texture compression */ /* @@ -1351,10 +1351,10 @@ DMesaGetCurrentBuffer (void) } -void * +DMesaProc DMesaGetProcAddress (const char *name) { - void *p = (void *)_glapi_get_proc_address(name); + DMesaProc p = (DMesaProc)_glapi_get_proc_address(name); /* TODO: handle DMesa* namespace if (p == NULL) { @@ -1411,7 +1411,7 @@ DMesaGetIntegerv (GLenum pname, GLint *params) } -#if (((__DJGPP__ << 8) | __DJGPP_MINOR__) >= 0x204) && USE_EXTERNAL_DXTN_LIB +#if SWTC && (((__DJGPP__ << 8) | __DJGPP_MINOR__) >= 0x204) #include extern_asm(___dj_assert); -- 2.30.2