summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwl <wl>2011-03-30 19:19:38 +0000
committerwl <wl>2011-03-30 19:19:38 +0000
commitf04bb247c23597681cc62b7bc057d0d9255cb0ec (patch)
treea942b6abde06e21233f5a8ebbb0252a2de96b448
parent891b010f70ca598568ea95d77517ed80947fee6d (diff)
downloadgroff-f04bb247c23597681cc62b7bc057d0d9255cb0ec.tar.gz
Fix compilation issues with gcc 2.95.
* src/roff/troff/input.cpp (my_input_iterator): Define as an alias for `input_iterator' which is predefined by an old libstdc++.
-rw-r--r--ChangeLog7
-rw-r--r--src/roff/troff/input.cpp3
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f543a39..d945e966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-29 Christian Weisgerber <naddy@mips.inka.de>
+
+ Fix compilation issues with gcc 2.95.
+
+ * src/roff/troff/input.cpp (my_input_iterator): Define as an alias
+ for `input_iterator' which is predefined by an old libstdc++.
+
2011-03-29 Ingo Schwarze <schwarze@usta.de>
Add another POSIX standard.
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index c28c0565..b71f27e0 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -155,6 +155,9 @@ static symbol get_delim_name();
static void init_registers();
static void trapping_blank_line();
+// this is for gcc 2.95 with old versions of libstdc++
+#define input_iterator my_input_iterator
+
class input_iterator;
input_iterator *make_temp_iterator(const char *);
const char *input_char_description(int);