--- a/src/bridge_gui.cpp	Mon May 26 18:30:58 2008 +0000
+++ b/src/bridge_gui.cpp	Mon May 26 20:20:38 2008 +0000
@@ -65,7 +65,7 @@
 
 	/* Constants for sorting the bridges */
 	static const StringID sorter_names[];
-	static const GUIBridgeList::SortFunction *const sorter_funcs[];
+	static GUIBridgeList::SortFunction *const sorter_funcs[];
 
 	/* Internal variables */
 	TileIndex start_tile;

--- a/src/core/bitmath_func.hpp	Mon May 26 18:30:58 2008 +0000
+++ b/src/core/bitmath_func.hpp	Mon May 26 20:20:38 2008 +0000
@@ -97,7 +97,7 @@
  * @param y The second value
  * @return True if at least one bit is set in both values, false else.
  */
-#define HASBITS(x, y) ((x) & (y))
+#define HASBITS(x, y) (((x) & (y)) != 0)
 
 /**
  * Set a bit in a variable.