Changeset - r22378:70a767bcd681
[Not reviewed]
master
0 1 0
frosch - 8 years ago 2016-05-22 10:15:35
frosch@openttd.org
(svn r27573) -Fix [FS#6467]: Compilation failure with gcc 6.1 due to headers included after safeguards.h (JGR)
1 file changed with 32 insertions and 33 deletions:
0 comments (0 inline, 0 general)
src/crashlog.cpp
Show inline comments
 
@@ -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 *b
 
	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.
0 comments (0 inline, 0 general)