diff src/process-nt.c @ 5922:4b055de36bb9 cygwin

merging heads 2
author Henry Thompson <ht@markup.co.uk>
date Fri, 27 Feb 2015 17:47:15 +0000
parents a216b3c2b09e
children a0d9bfe304de
line wrap: on
line diff
--- a/src/process-nt.c	Wed Apr 23 22:22:37 2014 +0100
+++ b/src/process-nt.c	Fri Feb 27 17:47:15 2015 +0000
@@ -1324,7 +1324,8 @@
 static void
 nt_open_network_stream (Lisp_Object name, Lisp_Object host,
 			Lisp_Object service,
-			Lisp_Object protocol, void **vinfd, void **voutfd)
+			Lisp_Object protocol, void **vinfd, void **voutfd,
+			Boolint tls)
 {
   struct sockaddr_in address;
   SOCKET s;