mesa: Clean up header file inclusion in accum.h.

[mesa.git] / src / mesa / main / accum.h

diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h
index 63740f07edca68f0c9bf300201a8858aac03dcbd..93442444979eac1d8db034cb6488caa47ea098d9 100644 (file)
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -37,16 +37,14 @@
 #ifndef ACCUM_H
 #define ACCUM_H
 
+#include "main/glheader.h"
+#include "main/mfeatures.h"
 
-#include "main/mtypes.h"
+struct _glapi_table;
+struct gl_context;
 
 #if FEATURE_accum
 
-#define _MESA_INIT_ACCUM_FUNCTIONS(driver, impl) \
-   do {                                          \
-      (driver)->Accum = impl ## Accum;           \
-   } while (0)
-
 extern void GLAPIENTRY
 _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
 
@@ -55,7 +53,7 @@ _mesa_init_accum_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_accum */
 
-#define _MESA_INIT_ACCUM_FUNCTIONS(driver, impl) do { } while (0)
+#include "main/compiler.h"
 
 static INLINE void
 _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
@@ -72,6 +70,6 @@ _mesa_init_accum_dispatch(struct _glapi_table *disp)
 #endif /* FEATURE_accum */
 
 extern void
-_mesa_init_accum( GLcontext *ctx );
+_mesa_init_accum( struct gl_context *ctx );
 
 #endif /* ACCUM_H */