From ffb437247f604950a0685cf0f69463d8c34650cd Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 2 Nov 2009 23:46:45 +0000
Subject: [PATCH] protect from newer flex

---
 direct/src/dcparser/dcLexer.lxx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/direct/src/dcparser/dcLexer.lxx b/direct/src/dcparser/dcLexer.lxx
index 6ef742e3c7..e48157044a 100644
--- a/direct/src/dcparser/dcLexer.lxx
+++ b/direct/src/dcparser/dcLexer.lxx
@@ -161,7 +161,14 @@ input_chars(char *buffer, int &result, int max_size) {
   }
 }
 #undef YY_INPUT
-#define YY_INPUT(buffer, result, max_size) input_chars(buffer, result, max_size)
+
+// Define this macro carefully, since different flex versions call it
+// with a different type for result.
+#define YY_INPUT(buffer, result, max_size) { \
+  int int_result; \
+  input_chars((buffer), int_result, (max_size)); \
+  (result) = int_result; \
+}
 
 // read_char reads and returns a single character, incrementing the
 // supplied line and column numbers as appropriate.  A convenience