Merged from miles@gnu.org--gnu-2005 (patch 610-614)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-610
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-611
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-612
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-613
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-614
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-429

2 files changed, 10 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c2e6ef390ee..2f584879147 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-20  Olli Savia  <ops@iki.fi>  (tiny change)
+
+        * etags.c: Undef STDIN if defined.  (LynxOS defines it in system
+        header files.)
+
 2005-09-27  Francesco Potort,Al(B  <pot@gnu.org>
 
         * etags.c: Preliminary Forth support.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index c8102ec1548..de0a2cf950b 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -477,6 +477,11 @@ static bool cplusplus;		/* .[hc] means C++, not C */
 static bool ignoreindent;       /* -I: ignore indentation in C */
 static bool packages_only;      /* --packages-only: in Ada, only tag packages*/
 
+/* STDIN is defined in LynxOS system headers */
+#ifdef STDIN
+#undef STDIN
+#endif
+
 #define STDIN 0x1001            /* returned by getopt_long on --parse-stdin */
 static bool parsing_stdin;      /* --parse-stdin used */