Correct ProcessIf: When evaluating a macro in an #if statement,

convert the macro value to either 0 or 1 before returning it.
Otherwise things fail badly if the macro is defined but empty: The
returned value is then not an integer, and cpp.pl would keep both the
#if and the #else branch of an if statement.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@4205 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/sbin/cpp.pl b/lib/sbin/cpp.pl
index 375abad0..0016fdff 100755
--- a/lib/sbin/cpp.pl
+++ b/lib/sbin/cpp.pl
@@ -680,7 +680,7 @@ sub ProcessIf
     else
     {
 #      print STDERR "#if <constant> called on non-digit and non-define $val at $filename\::$linenumber !\n";
-      $retval = defined($defines{$val}) ? $defines{$val} : 0;
+      $retval = defined($defines{$val}) ? ($defines{$val} ? 1 : 0) : 0;
     }
   }
   else