diff options
| author | smatz <smatz@openttd.org> | 2007-12-23 21:02:40 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2007-12-23 21:02:40 +0000 |
| commit | 17d1b522bc1b38390a3872820dbc812557ac1d71 (patch) | |
| tree | b2ae58ad998de5ce2917ae2a850ad83eaa15a846 | |
| parent | 22f79df32830d173827038222e509721c1e5ac18 (diff) | |
| download | openttd-17d1b522bc1b38390a3872820dbc812557ac1d71.tar.xz | |
(svn r11689) -Fix: compilation error and most of warnings for gcc 4.3
| -rw-r--r-- | config.lib | 6 | ||||
| -rw-r--r-- | src/cmd_helper.h | 2 | ||||
| -rw-r--r-- | src/rail_gui.cpp | 2 | ||||
| -rw-r--r-- | src/table/road_land.h | 8 |
4 files changed, 12 insertions, 6 deletions
diff --git a/config.lib b/config.lib index 115507342..5785c5308 100644 --- a/config.lib +++ b/config.lib @@ -885,6 +885,12 @@ make_cflags_and_ldflags() { CFLAGS="$CFLAGS -fno-strict-overflow" fi + # GCC 4.3+ gives a warning about empty body of + # loops and conditions + if [ $cc_version -ge 43 ]; then + CFLAGS="$CFLAGS -Wno-empty-body" + fi + if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then LIBS="$LIBS -lpthread" LIBS="$LIBS -lrt" diff --git a/src/cmd_helper.h b/src/cmd_helper.h index c18721430..6573915d5 100644 --- a/src/cmd_helper.h +++ b/src/cmd_helper.h @@ -8,7 +8,7 @@ template<uint N> static inline void ExtractValid(); -template<> static inline void ExtractValid<1>() {} +template<> inline void ExtractValid<1>() {} template<typename T> struct ExtractBits; diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 8ffcddc2b..00037911d 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1173,7 +1173,7 @@ enum BuildSignalWidgets { * @param xrel the relativ x value of the sprite in the grf * @param xsize the width of the sprite */ -static const void DrawSignalSprite(const Window *w, byte widget_index, SpriteID image, int8 xrel, uint8 xsize) +static void DrawSignalSprite(const Window *w, byte widget_index, SpriteID image, int8 xrel, uint8 xsize) { DrawSprite(image + w->IsWidgetLowered(widget_index), PAL_NONE, w->widget[widget_index].left + (w->widget[widget_index].right - w->widget[widget_index].left) / 2 - xrel - xsize / 2 + diff --git a/src/table/road_land.h b/src/table/road_land.h index 03259191c..6f09ec58e 100644 --- a/src/table/road_land.h +++ b/src/table/road_land.h @@ -33,24 +33,24 @@ static const DrawTileSprites _road_depot[] = { }; static const DrawTileSeqStruct _tram_depot_NE[] = { - TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x35 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 0, 15, 16, 1) + TILE_SEQ_LINE((SPR_TRAMWAY_BASE + 0x35) | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 0, 15, 16, 1) TILE_SEQ_END() }; static const DrawTileSeqStruct _tram_depot_SE[] = { TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x31, PAL_NONE, 0, 0, 1, 16) - TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x32 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 15, 0, 1, 16) + TILE_SEQ_LINE((SPR_TRAMWAY_BASE + 0x32) | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 15, 0, 1, 16) TILE_SEQ_END() }; static const DrawTileSeqStruct _tram_depot_SW[] = { TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x33, PAL_NONE, 0, 0, 16, 1) - TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x34 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 0, 15, 16, 1) + TILE_SEQ_LINE((SPR_TRAMWAY_BASE + 0x34) | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 0, 15, 16, 1) TILE_SEQ_END() }; static const DrawTileSeqStruct _tram_depot_NW[] = { - TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x36 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 15, 0, 1, 16) + TILE_SEQ_LINE((SPR_TRAMWAY_BASE + 0x36) | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 15, 0, 1, 16) TILE_SEQ_END() }; |