summaryrefslogtreecommitdiff
path: root/Source/cmStandardLexer.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-08-09 09:45:04 -0400
committerBrad King <brad.king@kitware.com>2006-08-09 09:45:04 -0400
commit3d6100d7c6117b24e02db83be59ff0b5a1442f23 (patch)
tree00a7b3d5d988f22b93c1ce64e960d49385a1fe7b /Source/cmStandardLexer.h
parentaab5816479bb7e211ce418b8ceb3da817b915cd5 (diff)
downloadcmake-3d6100d7c6117b24e02db83be59ff0b5a1442f23.tar.gz
COMP: Fix warnings produced by the change in include order from the re-organization of lexer code.
Diffstat (limited to 'Source/cmStandardLexer.h')
-rw-r--r--Source/cmStandardLexer.h36
1 files changed, 21 insertions, 15 deletions
diff --git a/Source/cmStandardLexer.h b/Source/cmStandardLexer.h
index 7ee448eb5d..24274f6ccd 100644
--- a/Source/cmStandardLexer.h
+++ b/Source/cmStandardLexer.h
@@ -33,19 +33,26 @@
#if defined(__BORLANDC__)
# pragma warn -8008 /* condition always returns true */
# pragma warn -8066 /* unreachable code */
+#endif
+
/* Borland system header defines these macros without first undef-ing them. */
-# if __BORLANDC__ >= 0x580
-# undef INT8_MIN
-# undef INT16_MIN
-# undef INT32_MIN
-# undef INT8_MAX
-# undef INT16_MAX
-# undef INT32_MAX
-# undef UINT8_MAX
-# undef UINT16_MAX
-# undef UINT32_MAX
-# include <stdint.h>
-# endif
+#if defined(__BORLANDC__) && __BORLANDC__ >= 0x580
+# undef INT8_MIN
+# undef INT16_MIN
+# undef INT32_MIN
+# undef INT8_MAX
+# undef INT16_MAX
+# undef INT32_MAX
+# undef UINT8_MAX
+# undef UINT16_MAX
+# undef UINT32_MAX
+# include <stdint.h>
+#endif
+
+/* Make sure SGI termios does not define ECHO differently. */
+#if defined(__sgi) && !defined(__GNUC__)
+# include <sys/termios.h>
+# undef ECHO
#endif
/* Define isatty on windows. */
@@ -59,9 +66,8 @@
/* Disable features we do not need. */
#define YY_NEVER_INTERACTIVE 1
-
-/* Avoid display of input matches to standard output. */
-#undef ECHO /* SGI termios defines this differently. */
+#define YY_NO_INPUT 1
+#define YY_NO_UNPUT 1
#define ECHO
#endif