summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2008-05-26 20:20:38 +0000
committerglx <glx@openttd.org>2008-05-26 20:20:38 +0000
commit6e6014918ea76fca66e458e565d69a11ed0f00e6 (patch)
treeff079ed6c9a34ca5c646d1c64c44d2dbb72ee25b /src
parent0972b3dd15bdb2150415ab2ba30fbd4e58301c52 (diff)
downloadopenttd-6e6014918ea76fca66e458e565d69a11ed0f00e6.tar.xz
(svn r13273) -Fix [FS#2042]: MSVC warnings (again)
Diffstat (limited to 'src')
-rw-r--r--src/bridge_gui.cpp2
-rw-r--r--src/core/bitmath_func.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index 7d1c09df4..a2d49ae2b 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -65,7 +65,7 @@ private:
/* 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;
diff --git a/src/core/bitmath_func.hpp b/src/core/bitmath_func.hpp
index 775ae8338..dd93b11d9 100644
--- a/src/core/bitmath_func.hpp
+++ b/src/core/bitmath_func.hpp
@@ -97,7 +97,7 @@ template<typename T> static inline bool HasBit(const T x, const uint8 y)
* @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.