glsl: Merge the lists of uniform blocks into the linked shader program.

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

diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
index dbae1bbd06b253413e00db6af95c03f2af34b216..d97e74abbadcd4a793b527c8bcee7e9668b1adc7 100644 (file)
--- a/src/mesa/main/histogram.h
+++ b/src/mesa/main/histogram.h
@@ -36,7 +36,10 @@
 #ifndef HISTOGRAM_H
 #define HISTOGRAM_H
 
-#include "main/mtypes.h"
+#include "compiler.h"
+#include "mfeatures.h"
+
+struct _glapi_table;
 
 #if FEATURE_histogram
 
@@ -45,13 +48,11 @@ _mesa_init_histogram_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_histogram */
 
-static INLINE void
+static inline void
 _mesa_init_histogram_dispatch(struct _glapi_table *disp)
 {
 }
 
 #endif /* FEATURE_histogram */
 
-extern void _mesa_init_histogram( GLcontext * ctx );
-
 #endif /* HISTOGRAM_H */