diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/Makefile.X11 | 4 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11 index f1b7698a92b..fbf8d20999d 100644 --- a/src/mesa/main/Makefile.X11 +++ b/src/mesa/main/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.38 2001/01/05 05:31:42 keithw Exp $ +# $Id: Makefile.X11,v 1.39 2001/01/08 21:55:59 keithw Exp $ # Mesa 3-D graphics library # Version: 3.5 @@ -188,8 +188,8 @@ ASM_SOURCES = ADDITIONAL_OBJ = OBJECTS = $(ASM_SOURCES:.S=.o) \ - $(CORE_SOURCES:.c=.o) \ $(DRIVER_SOURCES:.c=.o) \ + $(CORE_SOURCES:.c=.o) \ $(ADDITIONAL_OBJ) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 4cb966f7d2f..f3a3a56b0a3 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1,4 +1,4 @@ -/* $Id: mtypes.h,v 1.12 2001/01/08 04:09:41 keithw Exp $ */ +/* $Id: mtypes.h,v 1.13 2001/01/08 21:55:59 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -1576,13 +1576,14 @@ struct __GLcontextRec { /* Dither disable via MESA_NO_DITHER env var */ GLboolean NoDither; -#ifdef DEBUG GLboolean Rendering; -#endif #if defined(MESA_TRACE) struct _glapi_table *TraceDispatch; trace_context_t *TraceCtx; +#else + void *TraceDispatch; + void *TraceCtx; #endif /* Hooks for module contexts. These will eventually live |