diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-06-27 15:35:24 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-06-27 16:46:22 -0400 |
| commit | 38a13fe227e6b59a49509d4b5ae6618b4c14937a (patch) | |
| tree | e81fb31b46ffc1e948c48d647ca7d2bc2467a211 /src/parser/antlr_line_buffered_input.cpp | |
| parent | e6f4f9fbd3e2e3471f0df46959e3924368f31bdb (diff) | |
Remove output.h from public space, to avoid clashes with symbols defined in users' space.
Specifically, output.h was moved to CVC4's "private-library" rules, which means that it's
not installed on users' machines, and public headers should not include it.
Thanks to Alex Horn for raising the issue on the CVC-BUGS mailing list.
Diffstat (limited to 'src/parser/antlr_line_buffered_input.cpp')
| -rw-r--r-- | src/parser/antlr_line_buffered_input.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/parser/antlr_line_buffered_input.cpp b/src/parser/antlr_line_buffered_input.cpp index c2f73d988..a59fb3531 100644 --- a/src/parser/antlr_line_buffered_input.cpp +++ b/src/parser/antlr_line_buffered_input.cpp @@ -16,6 +16,15 @@ **/ #include <antlr3.h> + +// ANTLR3 headers define these in our space :( +// undef them so that we don't get multiple-definition warnings +#undef PACKAGE_BUGREPORT +#undef PACKAGE_NAME +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_VERSION + #include <iostream> #include <string> #include <cassert> |