From 7a9cd53f152fbc95cc98f1efeb8920c56e1e72a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
Date: Tue, 28 Oct 2014 22:30:12 -0200
Subject: [PATCH] (qb) Add header argument to check_lib

---
 qb/config.libs.sh | 5 ++++-
 qb/qb.libs.sh     | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 301fc9e33a..45fe114269 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -14,6 +14,7 @@ DYLIB=-ldl;
 CLIB=-lc
 PTHREADLIB=-lpthread
 SOCKETLIB=-lc
+SOCKETHEADER=
 
 if [ "$OS" = 'BSD' ]; then
    DYLIB=-lc;
@@ -24,6 +25,7 @@ elif [ "$OS" = 'Haiku' ]; then
    SOCKETLIB=-lnetwork
 elif [ "$OS" = 'Win32' ]; then
    SOCKETLIB=-lws2_32
+   SOCKETHEADER="#include <winsock2.h>"
    DYLIB=
 fi
 
@@ -133,7 +135,8 @@ else
    check_lib DYLIB "$DYLIB" dlopen
 fi
 
-check_lib NETPLAY "$SOCKETLIB" socket
+check_lib NETPLAY "$SOCKETLIB" socket "" "$SOCKETHEADER"
+
 if [ "$HAVE_NETPLAY" = 'yes' ]; then
    HAVE_GETADDRINFO=auto
    check_lib GETADDRINFO "$SOCKETLIB" getaddrinfo
diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh
index 086a108103..6086786147 100644
--- a/qb/qb.libs.sh
+++ b/qb/qb.libs.sh
@@ -19,13 +19,17 @@ add_include_dirs()
 add_library_dirs()
 {	while [ "$1" ]; do LIBRARY_DIRS="$LIBRARY_DIRS -L$1"; shift; done;}
 
-check_lib()	#$1 = HAVE_$1	$2 = lib	$3 = function in lib	$4 = extralibs
+check_lib()	#$1 = HAVE_$1	$2 = lib	$3 = function in lib	$4 = extralibs $5 = headers
 {	tmpval="$(eval echo \$HAVE_$1)"
 	[ "$tmpval" = 'no' ] && return 0
 
 	if [ "$3" ]; then
 		ECHOBUF="Checking function $3 in ${2% }"
-		echo "void $3(void); int main(void) { $3(); return 0; }" > $TEMP_C
+		if [ "$5" ]; then
+			printf "$5\nint main(void) { void *p = (void*)$3; return 0; }" > $TEMP_C
+		else
+			echo "void $3(void); int main(void) { $3(); return 0; }" > $TEMP_C
+		fi
 	else
 		ECHOBUF="Checking existence of ${2% }"
 		echo "int main(void) { return 0; }" > $TEMP_C