aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--configure.in16
-rw-r--r--src/ChangeLog4
-rw-r--r--src/s/unixware.h75
-rw-r--r--src/s/usg5-4-2.h73
5 files changed, 82 insertions, 90 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a942707fa9..ca960a4ee1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
12010-03-20 Dan Nicolaescu <dann@ics.uci.edu> 12010-03-20 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * configure.in: Remove support for old UNIX System V systems and
4 for Unixware on non-x86 machines.
5
3 * configure.in: Remove support for Solaris on PPC and for old versions. 6 * configure.in: Remove support for Solaris on PPC and for old versions.
7
4 * configure.in: Remove non-working lynxos port. 8 * configure.in: Remove non-working lynxos port.
5 9
62010-03-19 Dan Nicolaescu <dann@ics.uci.edu> 102010-03-19 Dan Nicolaescu <dann@ics.uci.edu>
diff --git a/configure.in b/configure.in
index db48df4d3a0..2a3ac32fd85 100644
--- a/configure.in
+++ b/configure.in
@@ -639,22 +639,6 @@ esac
639if test x"${opsys}" = x; then 639if test x"${opsys}" = x; then
640 case "${canonical}" in 640 case "${canonical}" in
641 *-gnu* ) opsys=gnu ;; 641 *-gnu* ) opsys=gnu ;;
642 *-sysv4.2uw* ) opsys=unixware ;;
643 *-sysv5uw* ) opsys=unixware ;;
644 *-sysv5OpenUNIX* ) opsys=unixware ;;
645 *-sysv4.1* | *-sysvr4.1* )
646 NON_GNU_CPP=/usr/lib/cpp
647 opsys=usg5-4 ;;
648 *-sysv4.[2-9]* | *-sysvr4.[2-9]* )
649 if [ x$NON_GNU_CPP = x ]; then
650 if [ -f /usr/ccs/lib/cpp ]; then
651 NON_GNU_CPP=/usr/ccs/lib/cpp
652 else
653 NON_GNU_CPP=/lib/cpp
654 fi
655 fi
656 opsys=usg5-4-2 ;;
657 *-sysv4* | *-sysvr4* ) opsys=usg5-4 ;;
658 * ) 642 * )
659 unported=yes 643 unported=yes
660 ;; 644 ;;
diff --git a/src/ChangeLog b/src/ChangeLog
index e17c9a2abe1..858fbe394c5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12010-03-20 Dan Nicolaescu <dann@ics.uci.edu> 12010-03-20 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 Remove support for old UNIX System V systems.
4 * s/unixware.h: Add the contents of s/usg-5-4-2.h.
5 * s/usg-5-4-2.h: Remove.
6
3 Remove support for Solaris on PPC and for old versions. 7 Remove support for Solaris on PPC and for old versions.
4 * s/sol2-6.h: Add the contents of s/sol-2.3.h, s/sol-2.4.h, s/sol-2.5.h. 8 * s/sol2-6.h: Add the contents of s/sol-2.3.h, s/sol-2.4.h, s/sol-2.5.h.
5 (LD_SWITCH_SYSTEM, USE_MMAP_FOR_BUFFERS): Remove #defines/#undef 9 (LD_SWITCH_SYSTEM, USE_MMAP_FOR_BUFFERS): Remove #defines/#undef
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 934821dd166..d626e122b14 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -1,4 +1,77 @@
1#include "usg5-4-2.h" 1/* s/ file for Unixware.
2
3 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
4 2008, 2009, 2010 Free Software Foundation, Inc.
5
6This file is part of GNU Emacs.
7
8GNU Emacs is free software: you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by
10the Free Software Foundation, either version 3 of the License, or
11(at your option) any later version.
12
13GNU Emacs is distributed in the hope that it will be useful,
14but WITHOUT ANY WARRANTY; without even the implied warranty of
15MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16GNU General Public License for more details.
17
18You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20
21
22#include "usg5-4.h"
23
24/* fnf@cygnus.com says these exist. */
25#define HAVE_TCATTR
26/* #define HAVE_GETWD (appears to be buggy on SVR4.2) */
27#undef HAVE_GETWD
28
29/* Info from fnf@cygnus.com suggests this is appropriate. */
30#define POSIX_SIGNALS
31
32/* We don't need the definition from usg5-3.h with POSIX_SIGNALS. */
33#undef sigsetmask
34#undef HAVE_SYSV_SIGPAUSE
35
36/* Motif needs -lgen. */
37#define LIBS_SYSTEM -lsocket -lnsl -lelf -lgen
38
39/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
40 rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't
41 work if POSIX_SIGNALS is defined. It may also be appropriate for SVR4.x
42 (x<2) but I'm not sure. fnf@cygnus.com */
43/* This sets the name of the slave side of the PTY. On SysVr4,
44 grantpt(3) forks a subprocess, so keep sigchld_handler() from
45 intercepting that death. If any child but grantpt's should die
46 within, it should be caught after sigrelse(2). */
47
48#undef PTY_TTY_NAME_SPRINTF
49#define PTY_TTY_NAME_SPRINTF \
50 { \
51 char *ptsname(), *ptyname; \
52 \
53 sigblock(sigmask(SIGCLD)); \
54 if (grantpt(fd) == -1) \
55 fatal("could not grant slave pty"); \
56 sigunblock(sigmask(SIGCLD)); \
57 if (unlockpt(fd) == -1) \
58 fatal("could not unlock slave pty"); \
59 if (!(ptyname = ptsname(fd))) \
60 fatal ("could not enable slave pty"); \
61 strncpy(pty_name, ptyname, sizeof(pty_name)); \
62 pty_name[sizeof(pty_name) - 1] = 0; \
63 }
64
65/* Use libw.a along with X11R6 Xt. */
66#define NEED_LIBW
67
68/* ryanr@ellingtn.ftc.nrcs.usda.gov (Richard Anthony Ryan) says -lXimp
69 is needed in UNIX_SV ... 4.2 1.1.2. */
70#define LIB_MOTIF -lXm -lXimp
71
72/* arch-tag: 9bbfcfc1-19be-45a1-9699-af57b87da2c6
73 (do not change this comment) */
74
2 75
3#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base) 76#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
4 77
diff --git a/src/s/usg5-4-2.h b/src/s/usg5-4-2.h
deleted file mode 100644
index d7f2c60ffc1..00000000000
--- a/src/s/usg5-4-2.h
+++ /dev/null
@@ -1,73 +0,0 @@
1/* s/ file for System V release 4.2.
2
3 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
4 2008, 2009, 2010 Free Software Foundation, Inc.
5
6This file is part of GNU Emacs.
7
8GNU Emacs is free software: you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by
10the Free Software Foundation, either version 3 of the License, or
11(at your option) any later version.
12
13GNU Emacs is distributed in the hope that it will be useful,
14but WITHOUT ANY WARRANTY; without even the implied warranty of
15MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16GNU General Public License for more details.
17
18You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20
21
22#include "usg5-4.h"
23
24/* fnf@cygnus.com says these exist. */
25#define HAVE_TCATTR
26/* #define HAVE_GETWD (appears to be buggy on SVR4.2) */
27#undef HAVE_GETWD
28
29/* Info from fnf@cygnus.com suggests this is appropriate. */
30#define POSIX_SIGNALS
31
32/* We don't need the definition from usg5-3.h with POSIX_SIGNALS. */
33#undef sigsetmask
34#undef HAVE_SYSV_SIGPAUSE
35
36/* Motif needs -lgen. */
37#define LIBS_SYSTEM -lsocket -lnsl -lelf -lgen
38
39/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
40 rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't
41 work if POSIX_SIGNALS is defined. It may also be appropriate for SVR4.x
42 (x<2) but I'm not sure. fnf@cygnus.com */
43/* This sets the name of the slave side of the PTY. On SysVr4,
44 grantpt(3) forks a subprocess, so keep sigchld_handler() from
45 intercepting that death. If any child but grantpt's should die
46 within, it should be caught after sigrelse(2). */
47
48#undef PTY_TTY_NAME_SPRINTF
49#define PTY_TTY_NAME_SPRINTF \
50 { \
51 char *ptsname(), *ptyname; \
52 \
53 sigblock(sigmask(SIGCLD)); \
54 if (grantpt(fd) == -1) \
55 fatal("could not grant slave pty"); \
56 sigunblock(sigmask(SIGCLD)); \
57 if (unlockpt(fd) == -1) \
58 fatal("could not unlock slave pty"); \
59 if (!(ptyname = ptsname(fd))) \
60 fatal ("could not enable slave pty"); \
61 strncpy(pty_name, ptyname, sizeof(pty_name)); \
62 pty_name[sizeof(pty_name) - 1] = 0; \
63 }
64
65/* Use libw.a along with X11R6 Xt. */
66#define NEED_LIBW
67
68/* ryanr@ellingtn.ftc.nrcs.usda.gov (Richard Anthony Ryan) says -lXimp
69 is needed in UNIX_SV ... 4.2 1.1.2. */
70#define LIB_MOTIF -lXm -lXimp
71
72/* arch-tag: 9bbfcfc1-19be-45a1-9699-af57b87da2c6
73 (do not change this comment) */
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-23 00:09:06 +0000