--- a/src/map.cpp	Thu Jan 17 16:46:41 2008 +0000
+++ b/src/map.cpp	Thu Jan 17 16:55:13 2008 +0000
@@ -139,7 +139,7 @@
  * @param addy the amount of tiles in the Y direction to add
  * @return translated tile, or INVALID_TILE when it would've wrapped.
  */
-uint TileAddWrap(TileIndex tile, int addx, int addy)
+TileIndex TileAddWrap(TileIndex tile, int addx, int addy)
 {
 	uint x = TileX(tile) + addx;
 	uint y = TileY(tile) + addy;

--- a/src/map_func.h	Thu Jan 17 16:46:41 2008 +0000
+++ b/src/map_func.h	Thu Jan 17 16:55:13 2008 +0000
@@ -227,7 +227,7 @@
 /**
  * Adds an offset to a tile and check if we are still on the map.
  */
-uint TileAddWrap(TileIndex tile, int addx, int addy);
+TileIndex TileAddWrap(TileIndex tile, int addx, int addy);
 
 /**
  * Returns the TileIndexDiffC offset from a DiagDirection.

--- a/src/water_cmd.cpp	Thu Jan 17 16:46:41 2008 +0000
+++ b/src/water_cmd.cpp	Thu Jan 17 16:55:13 2008 +0000
@@ -577,7 +577,8 @@
  *
  * @param tile tile to check
  */
-static inline void MarkTileDirtyIfCanal(TileIndex tile) {
+static inline void MarkTileDirtyIfCanal(TileIndex tile)
+{
 	if (IsTileType(tile, MP_WATER) && IsCanal(tile)) MarkTileDirtyByTile(tile);
 }