diff src/process.c @ 96833:c06568fd3844

* s/usg5-4.h (LIBS_SYSTEM): Remove, system for which this was added not supported anymore. * s/usg5-4-2.h (LIBS_SYSTEM): * s/sol2.h (LIBS_SYSTEM): Do not undefine. * s/netbsd.h (GETPGRP_NO_ARG, N_TRELOFF): * s/lynxos.h (GETPGRP_NO_ARG): * s/hpux10-20.h (NO_SIOCTL_H): * s/gnu.h (GETPGRP_NO_ARG): * s/gnu-linux.h (NO_SIOCTL_H): * s/freebsd.h (GETPGRP_NO_ARG, N_TRELOFF): * s/cygwin.h (GETPGRP_NO_ARG): * s/irix6-5.h (LIBS_SYSTEM, GETPGRP_NO_ARG): Remove, unused. (C_DEBUG_SWITCH): Remove duplicate definition. * m/ibms390.h: Remove boilerplate comments. * sysdep.c (closedir): Use SOLARIS2 instead of sun && USG5_4. * process.c (HAVE_SERIAL): Consolidate ifdefs. (wait_reading_process_output): Remove code for SunOS, platform not supported anymore. Use SOLARIS2 instead of sun.

--- a/src/process.c	Sun Jul 20 00:53:41 2008 +0000
+++ b/src/process.c	Sun Jul 20 13:03:56 2008 +0000
@@ -2785,9 +2785,7 @@
   UNGCPRO;
   return Qnil;
 }
-#endif /* HAVE_SERIAL  */
-
-#ifdef HAVE_SERIAL
+
 /* Used by make-serial-process to recover from errors.  */
 Lisp_Object make_serial_process_unwind (Lisp_Object proc)
 {
@@ -2796,9 +2794,7 @@
   remove_process (proc);
   return Qnil;
 }
-#endif /* HAVE_SERIAL  */
-
-#ifdef HAVE_SERIAL
+
 DEFUN ("make-serial-process", Fmake_serial_process, Smake_serial_process,
        0, MANY, 0,
        doc: /* Create and return a serial port process.
@@ -4912,19 +4908,6 @@
 	  IF_NON_BLOCKING_CONNECT (check_connect = 0);
 	}
 
-#if defined(sun) && !defined(USG5_4)
-      if (nfds > 0 && keyboard_bit_set (&Available)
-	  && interrupt_input)
-	/* System sometimes fails to deliver SIGIO.
-
-	   David J. Mackenzie says that Emacs doesn't compile under
-	   Solaris if this code is enabled, thus the USG5_4 in the CPP
-	   conditional.  "I haven't noticed any ill effects so far.
-	   If you find a Solaris expert somewhere, they might know
-	   better." */
-	kill (getpid (), SIGIO);
-#endif
-
 #if 0 /* When polling is used, interrupt_input is 0,
 	 so get_input_pending should read the input.
 	 So this should not be needed.  */
@@ -7704,7 +7687,7 @@
 	  else
 	    error ("select error: %s", emacs_strerror (xerrno));
 	}
-#ifdef sun
+#ifdef SOLARIS2
       else if (nfds > 0 && (waitchannels & 1)  && interrupt_input)
 	/* System sometimes fails to deliver SIGIO.  */
 	kill (getpid (), SIGIO);