diff --git a/preprocessor.cpp b/preprocessor.cpp
index c258a04b6..329c4495c 100644
--- a/preprocessor.cpp
+++ b/preprocessor.cpp
@@ -283,7 +283,7 @@ static std::string getcode(const std::string &filedata, std::string cfg)
 
         bool match = true;
         for ( std::list<bool>::const_iterator it = matching_ifdef.begin(); it != matching_ifdef.end(); ++it )
-            match &= *it;
+            match &= bool(*it);
         if ( ! match )
             line = "";
 
diff --git a/tokenize.cpp b/tokenize.cpp
index ddbd0d0bf..123676636 100644
--- a/tokenize.cpp
+++ b/tokenize.cpp
@@ -299,7 +299,7 @@ void Tokenize(std::istream &code, const char FileName[])
     Files.push_back(FileName);
 
     // Tokenize the file..
-    TokenizeCode( code, Files.size() - 1 );
+    TokenizeCode( code, (unsigned int)(Files.size() - 1) );
 }
 //---------------------------------------------------------------------------