--- a/src/station_cmd.cpp	Fri Feb 02 06:42:55 2007 +0000
+++ b/src/station_cmd.cpp	Fri Feb 02 07:48:06 2007 +0000
@@ -2149,7 +2149,7 @@
 
 		case TRANSPORT_WATER:
 			// buoy is coded as a station, it is always on open water
-			if (IsBuoy_(tile)) return TRACK_BIT_ALL * 0x101;
+			if (IsBuoy(tile)) return TRACK_BIT_ALL * 0x101;
 			break;
 
 		case TRANSPORT_ROAD:

--- a/src/station_map.cpp	Fri Feb 02 06:42:55 2007 +0000
+++ b/src/station_map.cpp	Fri Feb 02 07:48:06 2007 +0000
@@ -14,6 +14,6 @@
 	if (IsBusStop(t)) return STATION_BUS;
 	if (IsOilRig(t)) return STATION_OILRIG;
 	if (IsDock(t)) return STATION_DOCK;
-	assert(IsBuoy_(t));
+	assert(IsBuoy(t));
 	return STATION_BUOY;
 }

--- a/src/station_map.h	Fri Feb 02 06:42:55 2007 +0000
+++ b/src/station_map.h	Fri Feb 02 07:48:06 2007 +0000
@@ -162,14 +162,14 @@
 	return IS_BYTE_INSIDE(GetStationGfx(t), GFX_DOCK_BASE, GFX_DOCK_BASE + DOCK_SIZE_TOTAL);
 }
 
-static inline bool IsBuoy_(TileIndex t) // XXX _ due to naming conflict
+static inline bool IsBuoy(TileIndex t)
 {
 	return GetStationGfx(t) == GFX_BUOY_BASE;
 }
 
 static inline bool IsBuoyTile(TileIndex t)
 {
-	return IsTileType(t, MP_STATION) && IsBuoy_(t);
+	return IsTileType(t, MP_STATION) && IsBuoy(t);
 }
 
 
@@ -221,7 +221,7 @@
 	};
 	assert(IsTileType(t, MP_STATION));
 
-	if (IsBuoy_(t)) return buoy_offset;
+	if (IsBuoy(t)) return buoy_offset;
 	if (IsOilRig(t)) return oilrig_offset;
 
 	assert(IsDock(t));

--- a/src/water_cmd.cpp	Fri Feb 02 06:42:55 2007 +0000
+++ b/src/water_cmd.cpp	Fri Feb 02 07:48:06 2007 +0000
@@ -352,7 +352,7 @@
 					return false;
 			}
 
-		case MP_STATION: return IsOilRig(tile) || IsDock(tile) || IsBuoy_(tile);
+		case MP_STATION: return IsOilRig(tile) || IsDock(tile) || IsBuoy(tile);
 		default:         return false;
 	}
 }