comparison src/procimpl.h @ 5923:61d7d7bcbe76 cygwin

merged heads after pull -u
author Henry Thompson <ht@markup.co.uk>
date Thu, 05 Feb 2015 17:19:05 +0000
parents a216b3c2b09e
children
comparison
equal deleted inserted replaced
5921:68639fb08af8 5923:61d7d7bcbe76
47 int separate_err); 47 int separate_err);
48 int (*tooltalk_connection_p) (Lisp_Process *p); 48 int (*tooltalk_connection_p) (Lisp_Process *p);
49 #ifdef HAVE_SOCKETS 49 #ifdef HAVE_SOCKETS
50 void (*open_network_stream) (Lisp_Object name, Lisp_Object host, 50 void (*open_network_stream) (Lisp_Object name, Lisp_Object host,
51 Lisp_Object service, Lisp_Object protocol, 51 Lisp_Object service, Lisp_Object protocol,
52 void** vinfd, void** voutfd); 52 void** vinfd, void** voutfd, Boolint tls);
53 #ifdef HAVE_MULTICAST 53 #ifdef HAVE_MULTICAST
54 void (*open_multicast_group) (Lisp_Object name, Lisp_Object dest, 54 void (*open_multicast_group) (Lisp_Object name, Lisp_Object dest,
55 Lisp_Object port, Lisp_Object ttl, 55 Lisp_Object port, Lisp_Object ttl,
56 void** vinfd, void** voutfd); 56 void** vinfd, void** voutfd);
57 #endif /* HAVE_MULTICAST */ 57 #endif /* HAVE_MULTICAST */