Commit c69cafe7 authored Aug 30, 2016 by Daniel Stenberg

connect: fix #ifdefs for debug versions of conn/streamclose() macros

CURLDEBUG is for the memory debugging

DEBUGBUILD is for the extra debug stuff

Pointed-out-by: Steve Holme

parent b73b423b

lib/connect.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1376,7 +1376,7 @@ CURLcode Curl_socket(struct connectdata *conn,
	*/		*/
	void Curl_conncontrol(struct connectdata *conn,		void Curl_conncontrol(struct connectdata *conn,
	int ctrl /* see defines in header */		int ctrl /* see defines in header */
	#ifdef CURLDEBUG		#ifdef DEBUGBUILD
	, const char *reason		, const char *reason
	#endif		#endif
	)		)

lib/connect.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -122,12 +122,12 @@ void Curl_tcpnodelay(struct connectdata *conn, curl_socket_t sockfd);

	void Curl_conncontrol(struct connectdata *conn,		void Curl_conncontrol(struct connectdata *conn,
	int closeit		int closeit
	#ifdef CURLDEBUG		#ifdef DEBUGBUILD
	, const char *reason		, const char *reason
	#endif		#endif
	);		);

	#ifdef CURLDEBUG		#ifdef DEBUGBUILD
	#define streamclose(x,y) Curl_conncontrol(x, CONNCTRL_STREAM, y)		#define streamclose(x,y) Curl_conncontrol(x, CONNCTRL_STREAM, y)
	#define connclose(x,y) Curl_conncontrol(x, CONNCTRL_CONNECTION, y)		#define connclose(x,y) Curl_conncontrol(x, CONNCTRL_CONNECTION, y)
	#define connkeep(x,y) Curl_conncontrol(x, CONNCTRL_KEEP, y)		#define connkeep(x,y) Curl_conncontrol(x, CONNCTRL_KEEP, y)