home *** CD-ROM | disk | FTP | other *** search
- *** config.h-d.P Tue Jan 8 13:24:37 1991
- --- config.h-dist Wed Feb 6 11:49:48 1991
- ***************
- *** 44,47 ****
- --- 44,53 ----
- #endif /* SHORTNAMES */
-
- + /* Define the return type of signal handlers if the s-xxx file
- + did not already do so. */
- + #ifndef SIGTYPE
- + #define SIGTYPE int
- + #endif
- +
- /* Define HAVE_X_WINDOWS if you want to use the X window system. */
-
-
- *** s-aix3-1.h.P Tue Jan 8 13:02:50 1991
- --- s-aix3-1.h Wed Feb 6 12:01:58 1991
- ***************
- *** 78,81 ****
- --- 78,88 ----
-
- /*
- + * Define HAVE_TERMIOS if the system provides POSIX-style
- + * terminal control. (HAVE_TERMIO is still required.)
- + */
- +
- + #define HAVE_TERMIOS
- +
- + /*
- * Define HAVE_TIMEVAL if the system supports the BSD style clock values.
- * Look in <sys/time.h> for a timeval structure.
-
- *** s-usg5-3.h.P Fri Jan 11 18:23:02 1991
- --- s-usg5-3.h Wed Feb 6 11:50:45 1991
- ***************
- *** 180,183 ****
- --- 180,187 ----
- #define INTERRUPTABLE_IO
-
- + /* On USG systems signal handlers return void */
- +
- + #define SIGTYPE void
- +
- /* On USG systems these have different names */
-
-
- *** dispnew.c.P Tue Jan 8 12:25:28 1991
- --- dispnew.c Wed Feb 6 11:26:46 1991
- ***************
- *** 1186,1189 ****
- --- 1186,1190 ----
-
- #ifdef SIGWINCH
- + SIGTYPE
- window_change_signal ()
- {
-
- *** emacs.c.P Fri Jan 11 22:16:31 1991
- --- emacs.c Wed Feb 6 11:27:04 1991
- ***************
- *** 105,108 ****
- --- 105,109 ----
-
- /* Handle bus errors, illegal instruction, etc. */
- + SIGTYPE
- fatal_error_signal (sig)
- int sig;
-
- *** data.c.P Fri Jan 4 19:15:14 1991
- --- data.c Wed Feb 6 11:45:03 1991
- ***************
- *** 1550,1553 ****
- --- 1550,1554 ----
- }
-
- + SIGTYPE
- arith_error (signo)
- int signo;
-
- *** keyboard.c.P Tue Jan 8 20:40:31 1991
- --- keyboard.c Wed Feb 6 11:30:44 1991
- ***************
- *** 793,796 ****
- --- 793,797 ----
-
- /* Alarm interrupt calls this and requests echoing at earliest safe time. */
- + SIGTYPE
- request_echo ()
- {
- ***************
- *** 900,904 ****
- Lisp_Object tem;
- jmp_buf save_jump;
- - extern request_echo ();
-
- if (unread_command_char >= 0)
- --- 901,904 ----
- ***************
- *** 1073,1076 ****
- --- 1073,1077 ----
- || ((c == (0200 | quit_char)) && !meta_key))
- {
- + extern SIGTYPE interrupt_signal ();
- interrupt_signal ();
- return;
- ***************
- *** 1945,1948 ****
- --- 1946,1950 ----
- If quit-flag is already non-nil, it stops the job right away. */
-
- + SIGTYPE
- interrupt_signal ()
- {
-
- *** process.c.P Tue Jan 15 20:28:48 1991
- --- process.c Wed Feb 6 11:46:28 1991
- ***************
- *** 977,980 ****
- --- 977,981 ----
- }
-
- + SIGTYPE
- create_process_1 (signo)
- int signo;
- ***************
- *** 1012,1016 ****
- int sv[2];
- #ifdef SIGCHLD
- ! int (*sigchld)();
- #endif
- char **env;
- --- 1013,1017 ----
- int sv[2];
- #ifdef SIGCHLD
- ! SIGTYPE (*sigchld)();
- #endif
- char **env;
- ***************
- *** 1109,1113 ****
- #if 0
- sigchld_deferred = 0;
- ! sigchld = (int (*)()) signal (SIGCHLD, create_process_sigchld);
- #endif
- #endif /* ordinary USG */
- --- 1110,1114 ----
- #if 0
- sigchld_deferred = 0;
- ! sigchld = signal (SIGCHLD, create_process_sigchld);
- #endif
- #endif /* ordinary USG */
- ***************
- *** 1877,1880 ****
- --- 1878,1882 ----
- jmp_buf send_process_frame;
-
- + SIGTYPE
- send_process_trap ()
- {
- ***************
- *** 2187,2190 ****
- --- 2189,2193 ----
- the SIGCLD queue. Fred Fish, UniSoft Systems Inc. */
-
- + SIGTYPE
- sigchld_handler (signo)
- int signo;
-
- *** sysdep.c.P Tue Jan 15 21:43:59 1991
- --- sysdep.c Wed Feb 6 11:34:32 1991
- ***************
- *** 118,148 ****
-
- #ifdef HAVE_TERMIO
- ! #ifdef IBMR2AIX
- ! #include <termio.h>
- #include <termios.h>
- ! #ifdef TIOCGETP
- ! #undef TIOCGETP
- ! #endif
- ! #define TIOCGETP TCGETS
- ! #undef TIOCSETN
- ! #define TIOCSETN TCSETSW
- ! #undef TIOCSETP
- ! #define TIOCSETP TCSETSF
- ! #undef TCSETAW
- ! #define TCSETAW TCSETS
- #else
- #include <termio.h>
- - #undef TIOCGETP
- - #define TIOCGETP TCGETA
- - #undef TIOCSETN
- - #define TIOCSETN TCSETAW
- - #undef TIOCSETP
- - #define TIOCSETP TCSETAF
- - #endif
- -
- - #ifndef IBMR2AIX
- #define TERMINAL struct termio
- ! #else
- ! #define TERMINAL struct termios
- #endif
-
- --- 118,134 ----
-
- #ifdef HAVE_TERMIO
- !
- ! #ifdef HAVE_TERMIOS
- #include <termios.h>
- ! #define TERMINAL struct termios
- ! #define term_get(fd,t) tcgetattr(fd,t)
- ! #define term_set(fd,t) tcsetattr(fd,TCSANOW,t)
- ! #define term_setw(fd,t) tcsetattr(fd,TCSADRAIN,t)
- #else
- #include <termio.h>
- #define TERMINAL struct termio
- ! #define term_get(fd,t) ioctl(fd,TCGETA,t)
- ! #define term_set(fd,t) ioctl(fd,TCSETA,t)
- ! #define term_setw(fd,t) ioctl(fd,TCSETAW,t)
- #endif
-
- ***************
- *** 164,172 ****
- #include <sgtty.h>
- #define TERMINAL struct sgttyb
- #define OSPEED(str) str.sg_ospeed
- #define SETOSPEED(str,new) (str.sg_ospeed = (new))
- #define TABS_OK(str) ((str.sg_flags & XTABS) != XTABS)
- - #undef TCSETAW
- - #define TCSETAW TIOCSETN
- #endif /* not VMS */
- #endif /* not HAVE_TERMIO */
- --- 150,159 ----
- #include <sgtty.h>
- #define TERMINAL struct sgttyb
- + #define term_get(fd,t) ioctl(fd,TIOCGETP,t)
- + #define term_set(fd,t) ioctl(fd,TIOCSETP,t)
- + #define term_setw(fd,t) ioctl(fd,TIOCSETN,t)
- #define OSPEED(str) str.sg_ospeed
- #define SETOSPEED(str,new) (str.sg_ospeed = (new))
- #define TABS_OK(str) ((str.sg_flags & XTABS) != XTABS)
- #endif /* not VMS */
- #endif /* not HAVE_TERMIO */
- ***************
- *** 322,327 ****
- queue_kbd_input ();
- #else /* not VMS */
- ! ioctl (0, TIOCGETP, &buf);
- ! ioctl (0, TIOCSETP, &buf);
- #endif /* not VMS */
- }
- --- 309,314 ----
- queue_kbd_input ();
- #else /* not VMS */
- ! term_get (0, &buf);
- ! term_set (0, &buf);
- #endif /* not VMS */
- }
- ***************
- *** 355,359 ****
- #else
- SETOSPEED (sg, B9600);
- ! ioctl (0, TIOCGETP, &sg);
- #endif /* not VMS */
- ospeed = OSPEED (sg);
- --- 342,346 ----
- #else
- SETOSPEED (sg, B9600);
- ! term_get (0, &sg);
- #endif /* not VMS */
- ospeed = OSPEED (sg);
- ***************
- *** 470,473 ****
- --- 457,463 ----
- int channel;
- {
- + #ifdef HAVE_TERMIOS
- + tcflush (channel, TCOFLUSH);
- + #else
- #ifdef TCFLSH
- ioctl (channel, TCFLSH, 1);
- ***************
- *** 481,484 ****
- --- 471,475 ----
- #endif
- #endif
- + #endif
- }
-
- ***************
- *** 493,497 ****
- TERMINAL s;
-
- ! ioctl (out, TIOCGETP, &s);
- #ifdef HAVE_TERMIO
- s.c_oflag |= OPOST; /* Enable output postprocessing */
- --- 484,488 ----
- TERMINAL s;
-
- ! term_get (out, &s);
- #ifdef HAVE_TERMIO
- s.c_oflag |= OPOST; /* Enable output postprocessing */
- ***************
- *** 510,513 ****
- --- 501,510 ----
- s.c_cc[VERASE] = 0377; /* disable erase processing */
- s.c_cc[VKILL] = 0377; /* disable kill processing */
- + #ifdef VSUSP
- + s.c_cc[VSUSP] = 0377; /* disable suspend processing */
- + #endif
- + #ifdef VDSUSP
- + s.c_cc[VDSUSP] = 0377; /* disable delayed suspend processing */
- + #endif
- #ifdef HPUX
- s.c_cflag = (s.c_cflag & ~CBAUD) | B9600; /* baud rate sanity */
- ***************
- *** 536,540 ****
- #endif /* not HAVE_TERMIO */
-
- ! ioctl (out, TIOCSETN, &s);
-
- #ifdef BSD4_1
- --- 533,537 ----
- #endif /* not HAVE_TERMIO */
-
- ! term_setw (out, &s);
-
- #ifdef BSD4_1
- ***************
- *** 556,560 ****
- int pid;
- {
- ! #ifdef IBMR2AIX
- tcsetpgrp ( 0, pid);
- #else
- --- 553,557 ----
- int pid;
- {
- ! #ifdef HAVE_TERMIOS
- tcsetpgrp ( 0, pid);
- #else
- ***************
- *** 571,575 ****
- {
- int code;
- ! int (*handler) ();
- };
-
- --- 568,572 ----
- {
- int code;
- ! SIGTYPE (*handler) ();
- };
-
- ***************
- *** 675,680 ****
- while (saved_handlers->code)
- {
- ! saved_handlers->handler
- ! = (int (*) ()) signal (saved_handlers->code, SIG_IGN);
- saved_handlers++;
- }
- --- 672,676 ----
- while (saved_handlers->code)
- {
- ! saved_handlers->handler = signal (saved_handlers->code, SIG_IGN);
- saved_handlers++;
- }
- ***************
- *** 844,848 ****
- #endif
- #else /* not VMS */
- ! ioctl (0, TIOCGETP, &old_gtty);
- #endif /* not VMS */
- if (!read_socket_hook)
- --- 840,844 ----
- #endif
- #else /* not VMS */
- ! term_get (0, &old_gtty);
- #endif /* not VMS */
- if (!read_socket_hook)
- ***************
- *** 884,897 ****
- tty.c_cc[VSWTCH] = CDEL; /* Turn off shell layering use of C-z */
- #endif /* VSWTCH */
- ! #ifdef mips /* The following code looks like the right thing in general,
- ! but it is said to cause a crash on USG V.4.
- ! Let's play safe by turning it on only for the MIPS. */
- #ifdef VSUSP
- ! tty.c_cc[VSUSP] = CDEL; /* Turn off mips handling of C-z. */
- #endif /* VSUSP */
- #ifdef V_DSUSP
- tty.c_cc[V_DSUSP] = CDEL; /* Turn off mips handling of C-y. */
- #endif /* V_DSUSP */
- - #endif /* mips */
-
- #ifdef AIX
- --- 880,900 ----
- tty.c_cc[VSWTCH] = CDEL; /* Turn off shell layering use of C-z */
- #endif /* VSWTCH */
- ! /* The following code looks like the right thing in general,
- ! which it is; SysVr4 can go jump in a lake if it crashes. */
- ! #ifdef VSTRT
- ! tty.c_cc[VSTRT] = CDEL; /* Turn off handling of C-s. */
- ! #endif /* VSTRT */
- ! #ifdef VSTOP
- ! tty.c_cc[VSTOP] = CDEL; /* Turn off handling of C-q. */
- ! #endif /* VSTOP */
- #ifdef VSUSP
- ! tty.c_cc[VSUSP] = CDEL; /* Turn off handling of C-z. */
- #endif /* VSUSP */
- + #ifdef VDSUSP
- + tty.c_cc[VDSUSP] = CDEL; /* Turn off handling of C-y. */
- + #endif /* VDSUSP */
- #ifdef V_DSUSP
- tty.c_cc[V_DSUSP] = CDEL; /* Turn off mips handling of C-y. */
- #endif /* V_DSUSP */
-
- #ifdef AIX
- ***************
- *** 900,908 ****
- tty.c_line = 0;
- tty.c_iflag &= ~ASCEDIT;
- - #else
- - tty.c_cc[VSTRT] = 255;
- - tty.c_cc[VSTOP] = 255;
- - tty.c_cc[VSUSP] = 255;
- - tty.c_cc[VDSUSP] = 255;
- #endif /* IBMR2AIX */
- /* Also, PTY overloads NUL and BREAK.
- --- 903,906 ----
- ***************
- *** 933,937 ****
- &tty.class, 12, 0, 0, 0, 0);
- #else
- ! ioctl (0, TIOCSETN, &tty);
- #endif /* not VMS */
-
- --- 931,935 ----
- &tty.class, 12, 0, 0, 0, 0);
- #else
- ! term_setw (0, &tty);
- #endif /* not VMS */
-
- ***************
- *** 938,947 ****
- /* This code added to insure that, if flow-control is not to be used,
- we have an unlocked screen at the start. */
- #ifdef TCXONC
- if (!flow_control) ioctl (0, TCXONC, 1);
- ! #endif
- #ifdef TIOCSTART
- if (!flow_control) ioctl (0, TIOCSTART, 0);
- #endif
-
- #ifdef AIX
- --- 936,950 ----
- /* This code added to insure that, if flow-control is not to be used,
- we have an unlocked screen at the start. */
- + #ifdef HAVE_TERMIOS
- + if (!flow_control) tcflow (0, TCOON);
- + #else
- #ifdef TCXONC
- if (!flow_control) ioctl (0, TCXONC, 1);
- ! #else
- #ifdef TIOCSTART
- if (!flow_control) ioctl (0, TIOCSTART, 0);
- #endif
- + #endif
- + #endif
-
- #ifdef AIX
- ***************
- *** 1056,1060 ****
- &tty.class, 12, 0, 0, 0, 0);
- #else
- ! ioctl (0, TIOCGETP, &tty);
- #endif /* not VMS */
- return (TABS_OK(tty));
- --- 1059,1063 ----
- &tty.class, 12, 0, 0, 0, 0);
- #else
- ! term_get (0, &tty);
- #endif /* not VMS */
- return (TABS_OK(tty));
- ***************
- *** 1165,1169 ****
- &old_gtty.class, 12, 0, 0, 0, 0);
- #else /* not VMS */
- ! while (ioctl (0, TCSETAW, &old_gtty) < 0 && errno == EINTR);
- #endif /* not VMS */
-
- --- 1168,1172 ----
- &old_gtty.class, 12, 0, 0, 0, 0);
- #else /* not VMS */
- ! while (term_setw (0, &old_gtty) < 0 && errno == EINTR);
- #endif /* not VMS */
-
- ***************
- *** 1616,1619 ****
- --- 1619,1623 ----
- int read_alarm_should_throw;
-
- + SIGTYPE
- select_alarm ()
- {
- ***************
- *** 1644,1648 ****
- extern int process_tick, update_tick;
- #endif
- ! int (*old_trap) ();
- char buf;
-
- --- 1648,1652 ----
- extern int process_tick, update_tick;
- #endif
- ! SIGTYPE (*old_trap) ();
- char buf;
-
- ***************
- *** 1714,1718 ****
- break;
- old_alarm = alarm (0);
- ! old_trap = (int (*)()) signal (SIGALRM, select_alarm);
- select_alarmed = 0;
- alarm (SELECT_PAUSE);
- --- 1718,1722 ----
- break;
- old_alarm = alarm (0);
- ! old_trap = signal (SIGALRM, select_alarm);
- select_alarmed = 0;
- alarm (SELECT_PAUSE);
- ***************
- *** 2282,2287 ****
- --- 2286,2296 ----
-
- rename (from, to)
- + #ifdef M_UNIX /* SCO UNIX: must match system header */
- + const char *from;
- + const char *to;
- + #else
- char *from;
- char *to;
- + #endif
- {
- if (access (from, 0) == 0)
-