diff options
| author | frosch <frosch@openttd.org> | 2016-05-22 10:15:35 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2016-05-22 10:15:35 +0000 |
| commit | 1b84d893e0c2acb34d880a4c1d68f9d2dc95af8e (patch) | |
| tree | 5aab8fd61ec3b625fb781e2907e9d126b7d71add /src | |
| parent | 13a86497ea74e5f5a3cdfba838f826f7841fd6a4 (diff) | |
| download | openttd-1b84d893e0c2acb34d880a4c1d68f9d2dc95af8e.tar.xz | |
(svn r27573) -Fix [FS#6467]: Compilation failure with gcc 6.1 due to headers included after safeguards.h (JGR)
Diffstat (limited to 'src')
| -rw-r--r-- | src/crashlog.cpp | 65 |
1 files changed, 32 insertions, 33 deletions
diff --git a/src/crashlog.cpp b/src/crashlog.cpp index 7ddc2131f..4000cfb03 100644 --- a/src/crashlog.cpp +++ b/src/crashlog.cpp @@ -36,6 +36,38 @@ #include <time.h> +#ifdef WITH_ALLEGRO +# include <allegro.h> +#endif /* WITH_ALLEGRO */ +#ifdef WITH_FONTCONFIG +# include <fontconfig/fontconfig.h> +#endif /* WITH_FONTCONFIG */ +#ifdef WITH_PNG + /* pngconf.h, included by png.h doesn't like something in the + * freetype headers. As such it's not alphabetically sorted. */ +# include <png.h> +#endif /* WITH_PNG */ +#ifdef WITH_FREETYPE +# include <ft2build.h> +# include FT_FREETYPE_H +#endif /* WITH_FREETYPE */ +#if defined(WITH_ICU_LAYOUT) || defined(WITH_ICU_SORT) +# include <unicode/uversion.h> +#endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */ +#ifdef WITH_LZMA +# include <lzma.h> +#endif +#ifdef WITH_LZO +#include <lzo/lzo1x.h> +#endif +#ifdef WITH_SDL +# include "sdl.h" +# include <SDL.h> +#endif /* WITH_SDL */ +#ifdef WITH_ZLIB +# include <zlib.h> +#endif + #include "safeguards.h" /* static */ const char *CrashLog::message = NULL; @@ -180,39 +212,6 @@ char *CrashLog::LogConfiguration(char *buffer, const char *last) const return buffer; } -/* Include these here so it's close to where it's actually used. */ -#ifdef WITH_ALLEGRO -# include <allegro.h> -#endif /* WITH_ALLEGRO */ -#ifdef WITH_FONTCONFIG -# include <fontconfig/fontconfig.h> -#endif /* WITH_FONTCONFIG */ -#ifdef WITH_PNG - /* pngconf.h, included by png.h doesn't like something in the - * freetype headers. As such it's not alphabetically sorted. */ -# include <png.h> -#endif /* WITH_PNG */ -#ifdef WITH_FREETYPE -# include <ft2build.h> -# include FT_FREETYPE_H -#endif /* WITH_FREETYPE */ -#if defined(WITH_ICU_LAYOUT) || defined(WITH_ICU_SORT) -# include <unicode/uversion.h> -#endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */ -#ifdef WITH_LZMA -# include <lzma.h> -#endif -#ifdef WITH_LZO -#include <lzo/lzo1x.h> -#endif -#ifdef WITH_SDL -# include "sdl.h" -# include <SDL.h> -#endif /* WITH_SDL */ -#ifdef WITH_ZLIB -# include <zlib.h> -#endif - /** * Writes information (versions) of the used libraries. * @param buffer The begin where to write at. |