[Mesa-dev] [PATCH 47/47] mesa: remove never-defined FEATURE_histogram conditional.

[Ian Romanick]

On 09/13/2012 11:19 AM, Oliver McFadden wrote:
> Signed-off-by: Oliver McFadden <oliver.mcfadden at linux.intel.com>
> ---
>   src/mesa/main/histogram.c |    4 ----
>   src/mesa/main/histogram.h |   11 -----------
>   2 files changed, 0 insertions(+), 15 deletions(-)
>
> diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
> index 44fc132..d3dc7dd 100644
> --- a/src/mesa/main/histogram.c
> +++ b/src/mesa/main/histogram.c
> @@ -32,8 +32,6 @@
>   #include "main/dispatch.h"
>
>
> -#if FEATURE_histogram
> -
>   /**********************************************************************
>    * API functions
>    */
> @@ -169,5 +167,3 @@ _mesa_init_histogram_dispatch(struct _glapi_table *disp)
>      SET_GetnHistogramARB(disp, _mesa_GetnHistogramARB);
>      SET_GetnMinmaxARB(disp, _mesa_GetnMinmaxARB);
>   }
> -
> -#endif /* FEATURE_histogram */
> diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
> index d97e74a..a9c3121 100644
> --- a/src/mesa/main/histogram.h
> +++ b/src/mesa/main/histogram.h
> @@ -41,18 +41,7 @@
>
>   struct _glapi_table;
>
> -#if FEATURE_histogram
> -
>   extern void
>   _mesa_init_histogram_dispatch(struct _glapi_table *disp);
>
> -#else /* FEATURE_histogram */
> -
> -static inline void
> -_mesa_init_histogram_dispatch(struct _glapi_table *disp)
> -{
> -}
> -
> -#endif /* FEATURE_histogram */
> -
>   #endif /* HISTOGRAM_H */
>

If FEATURE_historgram was never defined, doesn't just removing these #if 
blocks change the code?  This series should change things.