[FFmpeg-cvslog] r20620 - trunk/libavcodec/mpegaudio_tablegen.h

[Måns Rullgård]

Diego Biurrun <diego at biurrun.de> writes:

> On Thu, Nov 26, 2009 at 10:28:02AM +0000, M?ns Rullg?rd wrote:
>> Diego Biurrun <diego at biurrun.de> writes:
>> 
>> > On Thu, Nov 26, 2009 at 11:06:42AM +0100, mru wrote:
>> >> 
>> >> Log:
>> >> Revert "Add required header #include to fix 'make checkheaders'."
>> >> 
>> >> config.h must not be included in that file.  The table generator runs
>> >> on the host system, but config.h describes the target.
>> >
>> > However..
>> >
>> >> --- trunk/libavcodec/mpegaudio_tablegen.h	Thu Nov 26 10:59:10 2009	(r20619)
>> >> +++ trunk/libavcodec/mpegaudio_tablegen.h	Thu Nov 26 11:06:41 2009	(r20620)
>> >> @@ -27,7 +27,6 @@
>> >>  #include <math.h>
>> >> -#include "config.h"
>> >>  
>> >>  #define TABLE_4_3_SIZE (8191 + 16)*4
>> >>  #if CONFIG_HARDCODED_TABLES
>> >
>> > .. CONFIG_HARDCODED_TABLES is defined in config.h.  What gives?
>> 
>> Go and look again this file is used.  It CANNOT work if config.h is
>> included here.
>
> So how do you propose to fix the warning from 'make checkheaders'?

Not running it on that file would be one option.  Breaking the actual
build is certainly not an option.

-- 
M?ns Rullg?rd
mans at mansr.com