--- source-highlight-3.1.7/configure.old	2012-05-09 13:49:55.000000000 -0400
+++ source-highlight-3.1.7/configure	2016-05-29 22:55:44.335380664 -0400
@@ -18537,6 +18537,7 @@
 /* end confdefs.h.  */
 
              #include <stdbool.h>
+             #if ! defined __cplusplus || __cplusplus < 201103L
              #ifndef bool
               "error: bool is not defined"
              #endif
@@ -18552,6 +18553,7 @@
              #if true != 1
               "error: true is not 1"
              #endif
+             #endif
              #ifndef __bool_true_false_are_defined
               "error: __bool_true_false_are_defined is not defined"
              #endif
--- source-highlight-3.1.7/gl/m4/stdbool.m4.old	2011-12-16 12:10:10.000000000 -0500
+++ source-highlight-3.1.7/gl/m4/stdbool.m4	2016-05-29 22:41:51.924258591 -0400
@@ -43,6 +43,7 @@
         [AC_LANG_PROGRAM(
            [[
              #include <stdbool.h>
+             #if ! defined __cplusplus || __cplusplus < 201103L
              #ifndef bool
               "error: bool is not defined"
              #endif
@@ -58,6 +59,7 @@
              #if true != 1
               "error: true is not 1"
              #endif
+             #endif
              #ifndef __bool_true_false_are_defined
               "error: __bool_true_false_are_defined is not defined"
              #endif
--- source-highlight-3.1.7/lib/srchilite/settings.cpp.old	2016-05-29 23:09:23.000000000 -0400
+++ source-highlight-3.1.7/lib/srchilite/settings.cpp	2016-05-29 23:10:56.015942443 -0400
@@ -94,14 +94,14 @@
     string file = dataDir + "/" + testFileName;
     ifstream i(file.c_str());
 
-    return (i != 0);
+    return ((bool)i);
 }
 
 bool Settings::checkForConfFile() {
     string file = confDir + confFileName;
     ifstream i(file.c_str());
 
-    return (i != 0);
+    return ((bool)i);
 }
 
 bool Settings::readDataDir() {
@@ -109,7 +109,7 @@
     ifstream i(file.c_str());
 
     string line;
-    if (i != 0) {
+    if (i) {
         while (read_line(&i, line)) {
             if (line.size()) {
                 boost::cmatch what;