--- a/src/process.h	Mon Aug 13 10:23:52 2007 +0200
+++ b/src/process.h	Mon Aug 13 10:24:41 2007 +0200
@@ -18,8 +18,6 @@
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Synched up with: FSF 19.30. */
-
 #ifndef _XEMACS_PROCESS_H_
 #define _XEMACS_PROCESS_H_
 
@@ -48,7 +46,7 @@
 #define PROCESSP(x) RECORDP (x, process)
 #define GC_PROCESSP(x) GC_RECORDP (x, process)
 #define CHECK_PROCESS(x) CHECK_RECORD (x, process)
-#define PROCESS_LIVE_P(x) (XPROCESS(x)->infd >= 0)
+#define PROCESS_LIVE_P(x) (!NILP (XPROCESS(x)->pipe_instream))
 
 #ifdef emacs
 
@@ -62,7 +60,8 @@
 Lisp_Object Fopen_network_stream_internal (Lisp_Object name,
 					   Lisp_Object buffer,
 					   Lisp_Object host,
-					   Lisp_Object service);
+					   Lisp_Object service,
+					   Lisp_Object family);
 Lisp_Object Fopen_multicast_group_internal (Lisp_Object name,
 					    Lisp_Object buffer,
 					    Lisp_Object dest,
@@ -97,12 +96,12 @@
 			    Lisp_Object status_symbol,
 			    int exit_code, int core_dumped);
 
-void get_process_file_descriptors (struct Lisp_Process *p,
-				   int *infd, int *outfd);
+void get_process_streams (struct Lisp_Process *p,
+			  Lisp_Object *instr, Lisp_Object *outstr);
 int get_process_selected_p (struct Lisp_Process *p);
 void set_process_selected_p (struct Lisp_Process *p, int selected_p);
 
-struct Lisp_Process *get_process_from_input_descriptor (int infd);
+struct Lisp_Process *get_process_from_usid (USID usid);
 
 #ifdef HAVE_SOCKETS
 int network_connection_p (Lisp_Object process);