* s/usg5-4.h: Rename file to ...
* src/s/usg5-4-common.h: ... this for consistency with what we do for BSD.
* src/s/unixware.h:
* src/s/sol2-6.h:
* src/s/irix6-5.h: Update includes accordingly.
+2010-07-29 Dan Nicolaescu <dann@ics.uci.edu>
+
+ Rename s/usg5-4.h -> s/usg5-4-common.h.
+ * s/usg5-4.h: Rename file to ...
+ * s/usg5-4-common.h: ... this for consistency with what we do for BSD.
+ * s/unixware.h:
+ * s/sol2-6.h:
+ * s/irix6-5.h: Update includes accordingly.
+
2010-07-29 Jan Djärv <jan.h.d@swipnet.se>
* xfns.c (x_set_tool_bar_position): Remove debug fprintf.
#define IRIX6_5 /* used in m/iris4d */
-#include "usg5-4.h"
+#include "usg5-4-common.h"
#undef _longjmp /* use system versions, not conservative aliases */
#undef _setjmp
#undef SA_RESTART
-#undef TIOCSIGSEND /* defined in usg5-4.h */
+#undef TIOCSIGSEND /* defined in usg5-4-common.h */
/* Tested on Irix 6.5. SCM worked on earlier versions. */
#define GC_SETJMP_WORKS 1
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-#include "usg5-4.h"
+#include "usg5-4-common.h"
#define SOLARIS2
#define HAVE_LIBKSTAT
#endif
-/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
+/* This is the same definition as in usg5-4-common.h, but with sigblock/sigunblock
rather than sighold/sigrelse, which appear to be BSD4.1 specific.
It may also be appropriate for SVR4.x
(x<2) but I'm not sure. fnf@cygnus.com */
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-#include "usg5-4.h"
+#include "usg5-4-common.h"
/* fnf@cygnus.com says these exist. */
#define HAVE_TCATTR
#undef HAVE_SYSV_SIGPAUSE
-/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
+/* This is the same definition as in usg5-4-common.h, but with sigblock/sigunblock
rather than sighold/sigrelse, which appear to be BSD4.1 specific.
It may also be appropriate for SVR4.x
(x<2) but I'm not sure. fnf@cygnus.com */
--- /dev/null
+/* Definitions file for GNU Emacs running on AT&T's System V Release 4
+
+Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Written by James Van Artsdalen of Dell Computer Corp. james@bigtex.cactus.org.
+Subsequently improved for Dell 2.2 by Eric S. Raymond <esr@snark.thyrsus.com>.
+
+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 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+
+/* Use the SysVr3 file for at least base configuration. */
+#define USG /* System III, System V, etc */
+
+#define USG5
+#define USG5_4
+
+/* SYSTEM_TYPE should indicate the kind of system you are using.
+ It sets the Lisp variable system-type. */
+#define SYSTEM_TYPE "usg-unix-v"
+
+/* Define HAVE_TERMIO if the system provides sysV-style ioctls
+ for terminal control. */
+#define HAVE_TERMIO
+
+/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library
+ functions. Almost, but not quite the same as the 4.2 functions. */
+#define SYSV_SYSTEM_DIR
+
+/* The file containing the kernel's symbol table is called /unix. */
+#define KERNEL_FILE "/unix"
+
+/* The kernel symbol where the load average is found is named avenrun. */
+#define LDAV_SYMBOL "avenrun"
+
+/* setjmp and longjmp can safely replace _setjmp and _longjmp,
+ but they will run slower. */
+#define _setjmp setjmp
+#define _longjmp longjmp
+
+/* The docs for system V/386 suggest v.3 has sigpause, so let's try it. */
+#define HAVE_SYSV_SIGPAUSE
+
+/* On USG systems signal handlers return void. */
+#define SIGTYPE void
+
+/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars.
+ But get <termio.h> first to make sure ttold.h doesn't interfere.
+ And don't try to use SIGIO yet. */
+#include <sys/wait.h>
+
+#ifdef emacs
+#include <sys/filio.h>
+#include <termio.h>
+#include <sys/ttold.h>
+#include <signal.h>
+#include <sys/stream.h>
+#include <sys/stropts.h>
+#include <sys/termios.h>
+#define BROKEN_SIGIO
+#endif
+
+/* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
+ instead, there's a system variable _sys_nsig. Unfortunately, we need the
+ constant to dimension an array. So wire in the appropriate value here. */
+#define NSIG_MINIMUM 32
+
+/* We can support this. */
+#define CLASH_DETECTION
+
+/* Define HAVE_PTYS if the system supports pty devices. */
+#define HAVE_PTYS
+#define HAVE_TERMIOS
+
+/* It is possible to receive SIGCHLD when there are no children
+ waiting, because a previous waitsys(2) cleaned up the carcass of child
+ without clearing the SIGCHLD pending info. So, use a non-blocking
+ wait3 instead, which maps to waitpid(2) in SysVr4. */
+#define wait3(status, options, rusage) \
+ waitpid ((pid_t) -1, (status), (options))
+#define WRETCODE(w) (w >> 8)
+
+/* TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY
+ subprocesses the usual way. But TIOCSIGNAL does work for PTYs, and
+ this is all we need. */
+#define TIOCSIGSEND TIOCSIGNAL
+
+/* This change means that we don't loop through allocate_pty too many
+ times in the (rare) event of a failure. */
+#define FIRST_PTY_LETTER 'z'
+
+/* This sets the name of the master side of the PTY. */
+#define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx");
+
+/* Push various streams modules onto a PTY channel. */
+#define SETUP_SLAVE_PTY \
+ if (ioctl (xforkin, I_PUSH, "ptem") == -1) \
+ fatal ("ioctl I_PUSH ptem", errno); \
+ if (ioctl (xforkin, I_PUSH, "ldterm") == -1) \
+ fatal ("ioctl I_PUSH ldterm", errno); \
+ if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \
+ fatal ("ioctl I_PUSH ttcompat", errno);
+
+/* This definition was suggested for next release. So give it a try. */
+#define HAVE_SOCKETS
+
+/* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6
+ (do not change this comment) */
+++ /dev/null
-/* Definitions file for GNU Emacs running on AT&T's System V Release 4
-
-Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-
-Written by James Van Artsdalen of Dell Computer Corp. james@bigtex.cactus.org.
-Subsequently improved for Dell 2.2 by Eric S. Raymond <esr@snark.thyrsus.com>.
-
-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 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Use the SysVr3 file for at least base configuration. */
-#define USG /* System III, System V, etc */
-
-#define USG5
-#define USG5_4
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-#define SYSTEM_TYPE "usg-unix-v"
-
-/* Define HAVE_TERMIO if the system provides sysV-style ioctls
- for terminal control. */
-#define HAVE_TERMIO
-
-/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library
- functions. Almost, but not quite the same as the 4.2 functions. */
-#define SYSV_SYSTEM_DIR
-
-/* The file containing the kernel's symbol table is called /unix. */
-#define KERNEL_FILE "/unix"
-
-/* The kernel symbol where the load average is found is named avenrun. */
-#define LDAV_SYMBOL "avenrun"
-
-/* setjmp and longjmp can safely replace _setjmp and _longjmp,
- but they will run slower. */
-#define _setjmp setjmp
-#define _longjmp longjmp
-
-/* The docs for system V/386 suggest v.3 has sigpause, so let's try it. */
-#define HAVE_SYSV_SIGPAUSE
-
-/* On USG systems signal handlers return void. */
-#define SIGTYPE void
-
-/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars.
- But get <termio.h> first to make sure ttold.h doesn't interfere.
- And don't try to use SIGIO yet. */
-#include <sys/wait.h>
-
-#ifdef emacs
-#include <sys/filio.h>
-#include <termio.h>
-#include <sys/ttold.h>
-#include <signal.h>
-#include <sys/stream.h>
-#include <sys/stropts.h>
-#include <sys/termios.h>
-#define BROKEN_SIGIO
-#endif
-
-/* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
- instead, there's a system variable _sys_nsig. Unfortunately, we need the
- constant to dimension an array. So wire in the appropriate value here. */
-#define NSIG_MINIMUM 32
-
-/* We can support this. */
-#define CLASH_DETECTION
-
-/* Define HAVE_PTYS if the system supports pty devices. */
-#define HAVE_PTYS
-#define HAVE_TERMIOS
-
-/* It is possible to receive SIGCHLD when there are no children
- waiting, because a previous waitsys(2) cleaned up the carcass of child
- without clearing the SIGCHLD pending info. So, use a non-blocking
- wait3 instead, which maps to waitpid(2) in SysVr4. */
-#define wait3(status, options, rusage) \
- waitpid ((pid_t) -1, (status), (options))
-#define WRETCODE(w) (w >> 8)
-
-/* TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY
- subprocesses the usual way. But TIOCSIGNAL does work for PTYs, and
- this is all we need. */
-#define TIOCSIGSEND TIOCSIGNAL
-
-/* This change means that we don't loop through allocate_pty too many
- times in the (rare) event of a failure. */
-#define FIRST_PTY_LETTER 'z'
-
-/* This sets the name of the master side of the PTY. */
-#define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx");
-
-/* Push various streams modules onto a PTY channel. */
-#define SETUP_SLAVE_PTY \
- if (ioctl (xforkin, I_PUSH, "ptem") == -1) \
- fatal ("ioctl I_PUSH ptem", errno); \
- if (ioctl (xforkin, I_PUSH, "ldterm") == -1) \
- fatal ("ioctl I_PUSH ldterm", errno); \
- if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \
- fatal ("ioctl I_PUSH ttcompat", errno);
-
-/* This definition was suggested for next release. So give it a try. */
-#define HAVE_SOCKETS
-
-/* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6
- (do not change this comment) */
projects / emacs.git / commitdiff