Merge from emacs-23 branch.

[gnu-emacs] / src / s / openbsd.h

diff --git a/src/s/openbsd.h b/src/s/openbsd.h
index d3730324ce8f2b28bebf6244fbf3673334ecf882..d9d60e3b868e23d87e27cc39b35c436fcaf55ca2 100644 (file)
--- a/src/s/openbsd.h
+++ b/src/s/openbsd.h
@@ -1,28 +1,7 @@
-/* s/ file for openbsd systems.  */
+/* System file for openbsd.  */
 
-/* Mostly the same as NetBSD.  */
+/* The same as NetBSD.  Note there are differences in configure.  */
 #include "netbsd.h"
 
-/*  David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this
-    is necessary.  Otherwise Emacs dumps core when run -nw.  */
-#undef LIBS_TERMCAP
-
-#define TERMINFO
-#define LIBS_TERMCAP -lncurses
-
-#undef LD_SWITCH_SYSTEM_TEMACS
-#undef LD_SWITCH_SYSTEM
-#ifdef __ELF__
-
-/*  Han Boetes <han@mijncomputer.nl> says this
-    is necessary,  otherwise Emacs dumps core on elf systems.  */
-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Z
-
-#else
-
-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp
-
-#endif
-
 /* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
    (do not change this comment) */