Mercurial > hg > xemacs-beta
changeset 978:13e47461d509
[xemacs-hg @ 2002-08-29 19:45:20 by james]
Include syssignal.h instead of signal.h. Move NSIG setting code for SVR4
to syssignal.h.
| author | james |
|---|---|
| date | Thu, 29 Aug 2002 19:45:34 +0000 |
| parents | b6b74d181b7f |
| children | d9b4b0f21bdb |
| files | lib-src/ChangeLog lib-src/gnuserv.h lib-src/tcp.c src/ChangeLog src/getloadavg.c src/malloc.c src/s/usg5-4.h src/syssignal.h src/unexhp9k3.c |
| diffstat | 9 files changed, 41 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Thu Aug 29 08:28:50 2002 +0000 +++ b/lib-src/ChangeLog Thu Aug 29 19:45:34 2002 +0000 @@ -1,3 +1,10 @@ +2002-08-21 Jerry James <james@xemacs.org> + + * gnuserv.h: Revert previous patch. Include syssignal.h instead + of signal.h. + * tcp.c: Include config.h, and substitute syssignal.h for + signal.h. + 2002-08-02 Jerry James <james@xemacs.org> * gnuserv.h: Include signal.h early to define NSIG before config.h
--- a/lib-src/gnuserv.h Thu Aug 29 08:28:50 2002 +0000 +++ b/lib-src/gnuserv.h Thu Aug 29 19:45:34 2002 +0000 @@ -39,15 +39,6 @@ #define PATCHLEVEL 2 -#include <sys/types.h> -#include <sys/param.h> -#include <sys/stat.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <signal.h> -#include <errno.h> - #define NO_SHORTNAMES /* gnuserv should not be compiled using SOCKS */ #define DO_NOT_SOCKSIFY @@ -110,6 +101,15 @@ #endif /* No communication method pre-defined */ +#include <sys/types.h> +#include <sys/param.h> +#include <sys/stat.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "syssignal.h" +#include <errno.h> + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif
--- a/lib-src/tcp.c Thu Aug 29 08:28:50 2002 +0000 +++ b/lib-src/tcp.c Thu Aug 29 19:45:34 2002 +0000 @@ -32,6 +32,9 @@ * cc -O -o tcp tcp.c -DFUJITSU_UTS -lu -lsocket */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <fcntl.h> #include <ctype.h> @@ -51,7 +54,7 @@ #ifdef USG #include <sys/stat.h> -#include <signal.h> +#include "syssignal.h" #endif #ifdef USG
--- a/src/ChangeLog Thu Aug 29 08:28:50 2002 +0000 +++ b/src/ChangeLog Thu Aug 29 19:45:34 2002 +0000 @@ -1,3 +1,12 @@ +2002-08-21 Jerry James <james@xemacs.org> + + * getloadavg.c: Substitute syssignal.h for signal.h. + * malloc.c: Ditto. + * unexhp9k3.c: Ditto. + * syssignal.h: Put NSIG setting code for SVR4 here. + * s/usg5-4.h: Don't include signal.h. Remove NSIG setting code, + since signal.h has not yet been included. + 2002-08-16 Steve Youngs <youngs@xemacs.org> * config.h.in (XEMACS_EXTRA_NAME): New.
--- a/src/getloadavg.c Thu Aug 29 08:28:50 2002 +0000 +++ b/src/getloadavg.c Thu Aug 29 19:45:34 2002 +0000 @@ -408,7 +408,7 @@ #ifdef UMAX #include <stdio.h> -#include <signal.h> +#include "syssignal.h" #include <sys/time.h> #include <sys/wait.h> #include <sys/syscall.h>
--- a/src/malloc.c Thu Aug 29 08:28:50 2002 +0000 +++ b/src/malloc.c Thu Aug 29 19:45:34 2002 +0000 @@ -149,7 +149,7 @@ #else /* Determine which kind of system this is. */ -#include <signal.h> +#include "syssignal.h" #ifndef SIGTSTP #ifndef USG #define USG
--- a/src/s/usg5-4.h Thu Aug 29 08:28:50 2002 +0000 +++ b/src/s/usg5-4.h Thu Aug 29 19:45:34 2002 +0000 @@ -79,22 +79,12 @@ #include <sys/filio.h> #include <termio.h> #include <sys/ttold.h> -#include <signal.h> #include <sys/stream.h> #include <sys/termios.h> #endif #undef BROKEN_SIGIO -/* 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. - */ - -#ifndef NSIG -#define NSIG 32 -#endif - /* We need bss_end from emacs.c for undumping */ #ifndef USG_SHARED_LIBRARIES
--- a/src/syssignal.h Thu Aug 29 08:28:50 2002 +0000 +++ b/src/syssignal.h Thu Aug 29 19:45:34 2002 +0000 @@ -251,7 +251,15 @@ #endif #ifndef NSIG -# define NSIG (SIGUSR2+1) /* guess how many elements are in sys_siglist... */ +# ifdef USG5_4 +/* 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 32 +# else +# define NSIG (SIGUSR2+1) /* guess how many elements are in sys_siglist... */ +# endif #endif /* SYS_SIGLIST_DECLARED is determined by configure. On Linux, it seems,