Diego Biurrun <[email protected]> writes: > On Tue, Jun 19, 2012 at 11:44:28AM +0100, Måns Rullgård wrote: >> Diego Biurrun <[email protected]> writes: >> > On Tue, Jun 19, 2012 at 11:37:26AM +0100, Måns Rullgård wrote: >> >> Diego Biurrun <[email protected]> writes: >> >> >> >> > They are not really header files, so not treating them as such is more >> >> > consistent. This also fixes generation of Doxygen documentation, which >> >> > got confused by recursive #includes within function declarations. >> >> > --- >> >> > doc/Makefile | 2 +- >> >> > doc/print_options.c | 4 ++-- >> >> > libavcodec/options.c | 2 +- >> >> > libavcodec/{options_table.h => options_table.c} | 11 ----------- >> >> > libavformat/options.c | 2 +- >> >> > libavformat/{options_table.h => options_table.c} | 10 ---------- >> >> > 6 files changed, 5 insertions(+), 26 deletions(-) >> >> > rename libavcodec/{options_table.h => options_table.c} (99%) >> >> > rename libavformat/{options_table.h => options_table.c} (96%) >> >> >> >> [...] >> >> >> >> > diff --git a/libavcodec/options_table.h b/libavcodec/options_table.c >> >> > similarity index 99% >> >> > rename from libavcodec/options_table.h >> >> > rename to libavcodec/options_table.c >> >> > index f4a6ba7..c8e439f 100644 >> >> > --- a/libavcodec/options_table.h >> >> > +++ b/libavcodec/options_table.c >> >> > @@ -17,15 +17,6 @@ >> >> > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA >> >> > 02110-1301 USA >> >> > */ >> >> > >> >> > -#ifndef AVCODEC_OPTIONS_TABLE >> >> > -#define AVCODEC_OPTIONS_TABLE >> >> > - >> >> > -#include <float.h> >> >> > -#include <limits.h> >> >> > - >> >> > -#include "libavutil/opt.h" >> >> > -#include "avcodec.h" >> >> >> >> This is a bit more than just renaming. Please explain. >> > >> > Recursive includes within function declarations make Doxygen trip up. >> > So I made these files .c snippets instead of standalone .h files. >> >> That explains the renaming, which I'm fine with. Now please explain the >> other changes. > > I dropped the multiple inclusion guards because the options table files > are no longer header files. I dropped the #includes because they make > doxygen trip up and fail. Apparently it does not like #includes within > #includes in the middle of function definitions.
So the rule about all files #including what they need just went out the window? -- Måns Rullgård [email protected] _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
