summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2005-05-03 18:28:02 (GMT)
committerBrad King <brad.king@kitware.com>2005-05-03 18:28:02 (GMT)
commit7cd0192909a49cb8afb3460b069ddd1d8dc1364d (patch)
tree485878a719711dd5fdf853530c14adaf82bbc757
parent7ebba610107e76a4bf76c8d3348a11375ebebc77 (diff)
downloadCMake-7cd0192909a49cb8afb3460b069ddd1d8dc1364d.zip
CMake-7cd0192909a49cb8afb3460b069ddd1d8dc1364d.tar.gz
CMake-7cd0192909a49cb8afb3460b069ddd1d8dc1364d.tar.bz2
COMP: Need #undef ECHO to avoid conflict with system ECHO definition.
-rw-r--r--Source/cmDependsJavaLexer.cxx1
-rw-r--r--Source/cmDependsJavaLexer.in.l1
2 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmDependsJavaLexer.cxx b/Source/cmDependsJavaLexer.cxx
index 5951418..c37c2ff 100644
--- a/Source/cmDependsJavaLexer.cxx
+++ b/Source/cmDependsJavaLexer.cxx
@@ -690,6 +690,7 @@ Modify cmDependsJavaLexer.h:
/* Disable features we do not need. */
#define YY_NEVER_INTERACTIVE 1
+#undef ECHO /* SGI termios defines this differently. */
#define ECHO
/* Replace the lexer input function. */
diff --git a/Source/cmDependsJavaLexer.in.l b/Source/cmDependsJavaLexer.in.l
index 7afc323..74671d1 100644
--- a/Source/cmDependsJavaLexer.in.l
+++ b/Source/cmDependsJavaLexer.in.l
@@ -54,6 +54,7 @@ Modify cmDependsJavaLexer.h:
/* Disable features we do not need. */
#define YY_NEVER_INTERACTIVE 1
+#undef ECHO /* SGI termios defines this differently. */
#define ECHO
/* Replace the lexer input function. */