X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=imap-send.c;h=e33c78bff2536089676c9d82df3382926ac1196d;hb=22c31bf183bff576c7807f9d67abfc11ee8e1fa4;hp=fddaac00c0adea7347934b008da9b33e72fe5b5f;hpb=f2561fda364ad984ef1441a80c90b0ee04f1a7c4;p=git.git

diff --git a/imap-send.c b/imap-send.c
index fddaac00..e33c78bf 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -28,6 +28,7 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
+#include <sys/socket.h>
 #include <netdb.h>
 
 typedef struct store_conf {
@@ -371,7 +372,7 @@ free_generic_messages( message_t *msgs )
 }
 
 static int
-vasprintf( char **strp, const char *fmt, va_list ap )
+git_vasprintf( char **strp, const char *fmt, va_list ap )
 {
 	int len;
 	char tmp[1024];
@@ -401,7 +402,7 @@ nfsnprintf( char *buf, int blen, const char *fmt, ... )
 static int
 nfvasprintf( char **str, const char *fmt, va_list va )
 {
-	int ret = vasprintf( str, fmt, va );
+	int ret = git_vasprintf( str, fmt, va );
 	if (ret < 0)
 		die( "Fatal: Out of memory\n");
 	return ret;
@@ -945,7 +946,7 @@ imap_open_store( imap_server_conf_t *srvc )
 				_exit( 127 );
 			close( a[0] );
 			close( a[1] );
-			execl( "/bin/sh", "sh", "-c", srvc->tunnel, 0 );
+			execl( "/bin/sh", "sh", "-c", srvc->tunnel, NULL );
 			_exit( 127 );
 		}