Merged from miles@gnu.org--gnu-2005 (patch 192-203)

Patches applied:

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-193
   Use gdb-ui breakpoint faces on ttys too

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-198
   Tweak gdb-ui breakpoint faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-199
   Tweak gdb-ui breakpoint faces

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-201
   Tweak info/.arch-inventory to identify info/.cvsignore as source

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

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

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

1 files changed, 7 insertions, 0 deletions

diff --git a/src/s/openbsd.h b/src/s/openbsd.h
index d3730324ce8..39e48da39a7 100644
--- a/src/s/openbsd.h
+++ b/src/s/openbsd.h
@@ -3,6 +3,13 @@
 /* Mostly the same as NetBSD.  */
 #include "netbsd.h"
 
+/*  This very-badly named symbol is conditionally defined in netbsd.h.
+    Better would be either to not need it in the first place, or to choose
+    a more descriptive name.  */
+#ifndef LD_SWITCH_SYSTEM_tmp
+#define LD_SWITCH_SYSTEM_tmp /* empty */
+#endif
+
 /*  David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this
     is necessary.  Otherwise Emacs dumps core when run -nw.  */
 #undef LIBS_TERMCAP