Merge pull request #311 from kanoi/master

util.c - bug - proxy - no data end condition

compat.h

@@ -57,7 +57,7 @@ enum {
 	PRIO_PROCESS		= 0,
 };
 
-static inline int setpriority(int which, int who, int prio)
+static inline int setpriority(__maybe_unused int which, __maybe_unused int who, __maybe_unused int prio)
 {
 	/* FIXME - actually do something */
 	return 0;

util.c

@@ -480,6 +480,7 @@ static struct {
 	{ "socks4a:",	CURLPROXY_SOCKS4A },
 	{ "socks5h:",	CURLPROXY_SOCKS5_HOSTNAME },
 #endif
+	{ NULL,	0 }
 };
 #endif