Browse Source

protect from newer flex

David Rose 16 years ago
parent
commit
ffb437247f
1 changed files with 8 additions and 1 deletions
  1. 8 1
      direct/src/dcparser/dcLexer.lxx

+ 8 - 1
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