diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-16 16:16:50 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-16 16:16:50 +0000 |
commit | a12d96e87e113044ea57cd85ee27e15a1749fc49 (patch) | |
tree | b860e406fa67cf066a359ae281e1907d3a5c993a | |
parent | 5f5462c0ec32348a0b370b1f9c11bd7d10b52de6 (diff) | |
download | mpv-a12d96e87e113044ea57cd85ee27e15a1749fc49.tar.bz2 mpv-a12d96e87e113044ea57cd85ee27e15a1749fc49.tar.xz |
Fix sockaddr_storage check to work with winsock/MinGW
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30323 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 20 |
1 files changed, 17 insertions, 3 deletions
@@ -3103,8 +3103,10 @@ echores "$_socklib" if test $_winsock2_h = yes ; then _ld_sock="-lws2_32" def_winsock2_h='#define HAVE_WINSOCK2_H 1' + cc_check_winsock2_h='-DHAVE_WINSOCK2_H=1' else def_winsock2_h='#define HAVE_WINSOCK2_H 0' + cc_check_winsock2_h='-DHAVE_WINSOCK2_H=0' fi @@ -3112,12 +3114,16 @@ echocheck "netdb.h, struct addrinfo" if test "$_struct_addrinfo" = auto; then _struct_addrinfo=no cat > $TMPC << EOF +#if HAVE_WINSOCK2_H +#include <winsock2.h> +#else #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> +#endif int main(void) { struct addrinfo ai; return 0; } EOF - cc_check && _struct_addrinfo=yes + cc_check $cc_check_winsock2_h && _struct_addrinfo=yes fi echores "$_struct_addrinfo" @@ -3132,12 +3138,16 @@ echocheck "netdb.h, getaddrinfo()" if test "$_getaddrinfo" = auto; then _getaddrinfo=no cat > $TMPC << EOF +#if HAVE_WINSOCK2_H +#include <winsock2.h> +#else #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> +#endif int main(void) { (void) getaddrinfo(0, 0, 0, 0); return 0; } EOF - cc_check && _getaddrinfo=yes + cc_check $cc_check_winsock2_h && _getaddrinfo=yes fi echores "$_getaddrinfo" @@ -3152,10 +3162,14 @@ echocheck "sockaddr_storage" if test "$_struct_sockaddr_storage" = auto; then _struct_sockaddr_storage=no cat > $TMPC << EOF +#if HAVE_WINSOCK2_H +#include <winsock2.h> +#else #include <sys/socket.h> +#endif int main(void) { struct sockaddr_storage sas; return 0; } EOF - cc_check && _struct_sockaddr_storage=yes + cc_check $cc_check_winsock2_h && _struct_sockaddr_storage=yes fi echores "$_struct_sockaddr_storage" |