From f6914fd37b2b66d7be1ba0c31450d89d1785ccce Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Wed, 26 May 2010 09:32:57 -0700
Subject: [PATCH] Implement #if and friends.

With this change, tests 41 through 49 all pass. (The defined operator
appears to be somehow broken so that test 50 doesn't pass yet.)
---
 glcpp.h                              | 2 +-
 tests/049-if-expression-precedence.c | 1 -
 tests/050-if-defined.c               | 2 --
 tests/glcpp-test                     | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/glcpp.h b/glcpp.h
index 21db918cdce..36ab0e7ca5c 100644
--- a/glcpp.h
+++ b/glcpp.h
@@ -49,7 +49,7 @@ typedef struct token_list token_list_t;
 
 typedef union YYSTYPE
 {
-	int ival;
+	intmax_t ival;
 	char *str;
 	string_list_t *string_list;
 	token_t *token;
diff --git a/tests/049-if-expression-precedence.c b/tests/049-if-expression-precedence.c
index cea935220fd..833ea03882a 100644
--- a/tests/049-if-expression-precedence.c
+++ b/tests/049-if-expression-precedence.c
@@ -3,4 +3,3 @@ failure with operator precedence
 #else
 success
 #endif
-
diff --git a/tests/050-if-defined.c b/tests/050-if-defined.c
index 9838cc747d5..34f0f95140e 100644
--- a/tests/050-if-defined.c
+++ b/tests/050-if-defined.c
@@ -15,5 +15,3 @@ failure_3
 #else
 success_3
 #endif
-
-
diff --git a/tests/glcpp-test b/tests/glcpp-test
index 63041552104..bf88d4462e1 100755
--- a/tests/glcpp-test
+++ b/tests/glcpp-test
@@ -6,5 +6,5 @@ for test in *.c; do
     ../glcpp < $test > $test.out
     gcc -E $test -o $test.gcc
     grep -v '^#' < $test.gcc > $test.expected
-    diff -u $test.expected $test.out
+    diff -B -u $test.expected $test.out
 done
-- 
2.11.0