(fix_submap_inheritance, get_keyelt, store_in_keymap,

[bpt/emacs.git] / src / s / usg5-3.h

diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index 305718d..01eea23 100644 (file)
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
@@ -27,6 +28,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define USG5
 
+#define USG5_3
+
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
 
@@ -54,22 +57,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define HAVE_TERMIO
 
-/*
- *     Define HAVE_TIMEVAL if the system supports the BSD style clock values.
- *     Look in <sys/time.h> for a timeval structure.
- */
-
-/* #define HAVE_TIMEVAL */
- 
-/*
- *     Define HAVE_SELECT if the system supports the `select' system call.
- *     SVr3.2 X ports include an emulation.
- */
-
-#ifdef HAVE_X_WINDOWS
-#define HAVE_SELECT
-#endif /* HAVE_X_WINDOWS */
-
 /*
  *     Define HAVE_PTYS if the system supports pty devices.
  */
@@ -147,7 +134,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Define this if system V IPC is available.  */
 
 #define HAVE_SYSVIPC
-\f
+
 /* Special hacks needed to make Emacs run on this system.  */
 
 /*
@@ -164,7 +151,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
@@ -181,7 +168,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define INTERRUPTIBLE_IO
 
 /* On USG systems these have different names */
-
 #define index strchr
 #define rindex strrchr
 
@@ -199,6 +185,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define TERMINFO
 
+/* Some variants have TIOCGETC, but the structures to go with it
+   are not declared.  */
+
+#define BROKEN_TIOCGETC
+
 /* AT&T SVr3 X wants to be linked with shared libraries */
 
 #define LIB_X11_LIB -lX11_s
@@ -206,22 +197,17 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* X needs to talk on the network, so search the network library.  */
 
 #define LIBX10_SYSTEM -lnsl_s
-#define LIBX11_SYSTEM -lnls -lnsl_s -lpt -lc_s
+#define LIBX11_SYSTEM -lpt -lnls -lnsl_s -lc_s
 
-/* Some variants have TIOCGETC, but the structures to go with it
-   are not declared.  */
-
-#define BROKEN_TIOCGETC
+/* The docs for system V/386 suggest v.3 has sigpause,
+   so let's give it a try.  */
+#define HAVE_SYSV_SIGPAUSE
 
 /* Some variants have TIOCGWINSZ, but the structures to go with it
    are not declared.  */
 
 #define BROKEN_TIOCGWINSZ
 
-/* SVr3 does not have utimes(2) */
-
-#define USE_UTIME
-
 /* If we're using the System V X port, BSD bstring functions will be handy */
 
 #ifdef HAVE_X_WINDOWS