diff --git a/Network/BSD.hsc b/Network/BSD.hsc --- a/Network/BSD.hsc +++ b/Network/BSD.hsc @@ -166,7 +166,7 @@ return (ServiceEntry { serviceName = s_name, serviceAliases = s_aliases, -#if defined(HAVE_WINSOCK_H) && !defined(cygwin32_HOST_OS) +#if defined(HAVE_WINSOCK2_H) && !defined(cygwin32_HOST_OS) servicePort = PortNum (fromIntegral (s_port :: CShort)), #else -- s_port is already in network byte order, but it @@ -263,7 +263,7 @@ p_aliases <- (#peek struct protoent, p_aliases) p >>= peekArray0 nullPtr >>= mapM peekCString -#if defined(HAVE_WINSOCK_H) && !defined(cygwin32_HOST_OS) +#if defined(HAVE_WINSOCK2_H) && !defined(cygwin32_HOST_OS) -- With WinSock, the protocol number is only a short; -- hoist it in as such, but represent it on the Haskell side -- as a CInt. @@ -359,7 +359,7 @@ return (HostEntry { hostName = h_name, hostAliases = h_aliases, -#if defined(HAVE_WINSOCK_H) && !defined(cygwin32_HOST_OS) +#if defined(HAVE_WINSOCK2_H) && !defined(cygwin32_HOST_OS) hostFamily = unpackFamily (fromIntegral (h_addrtype :: CShort)), #else hostFamily = unpackFamily h_addrtype, diff --git a/Network/Socket.hsc b/Network/Socket.hsc --- a/Network/Socket.hsc +++ b/Network/Socket.hsc @@ -169,7 +169,7 @@ # if HAVE_STRUCT_MSGHDR_MSG_CONTROL || HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS {-# CFILES cbits/ancilData.c #-} # endif -# if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) +# if defined(HAVE_WINSOCK2_H) && !defined(__CYGWIN__) {-# CFILES cbits/initWinSock.c cbits/winSockErr.c #-} # endif #endif @@ -423,7 +423,7 @@ #endif socket_status <- newMVar NotConnected let sock = MkSocket fd family stype protocol socket_status -#ifdef HAVE_DECL_IPV6_V6ONLY +#if HAVE_DECL_IPV6_V6ONLY when (family == AF_INET6) $ setSocketOption sock IPv6Only 0 #endif return sock @@ -505,7 +505,7 @@ r <- c_connect s p_addr (fromIntegral sz) if r == -1 then do -#if !(defined(HAVE_WINSOCK_H) && !defined(cygwin32_HOST_OS)) +#if !(defined(HAVE_WINSOCK2_H) && !defined(cygwin32_HOST_OS)) err <- getErrno case () of _ | err == eINTR -> connectLoop @@ -921,7 +921,7 @@ #ifdef SO_USELOOPBACK | UseLoopBack {- SO_USELOOPBACK -} #endif -#ifdef HAVE_DECL_IPV6_V6ONLY +#if HAVE_DECL_IPV6_V6ONLY | IPv6Only {- IPV6_V6ONLY -} #endif deriving Typeable @@ -938,7 +938,7 @@ #ifdef TCP_NODELAY NoDelay -> #const IPPROTO_TCP #endif -#ifdef HAVE_DECL_IPV6_V6ONLY +#if HAVE_DECL_IPV6_V6ONLY IPv6Only -> #const IPPROTO_IPV6 #endif _ -> #const SOL_SOCKET diff --git a/cbits/asyncAccept.c b/cbits/asyncAccept.c --- a/cbits/asyncAccept.c +++ b/cbits/asyncAccept.c @@ -5,7 +5,8 @@ #include "HsNet.h" #include "HsFFI.h" -#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) && !defined(__HUGS__) +#if defined(HAVE_WINSOCK2_H) && !defined(__CYGWIN__) && !defined(__HUGS__) + /* all the way to the end */ /* diff --git a/cbits/initWinSock.c b/cbits/initWinSock.c --- a/cbits/initWinSock.c +++ b/cbits/initWinSock.c @@ -1,7 +1,7 @@ #include "HsNet.h" #include "HsFFI.h" -#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) +#if defined(HAVE_WINSOCK2_H) && !defined(__CYGWIN__) static int winsock_inited = 0; static int winsock_uninited = 0; diff --git a/cbits/winSockErr.c b/cbits/winSockErr.c --- a/cbits/winSockErr.c +++ b/cbits/winSockErr.c @@ -1,7 +1,7 @@ #include "HsNet.h" #include "HsFFI.h" -#if defined(HAVE_WINSOCK_H) && !defined(__CYGWIN__) +#if defined(HAVE_WINSOCK2_H) && !defined(__CYGWIN__) #include /* to the end */ diff --git a/configure b/configure --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for Haskell network package 2.3.0.9. +# Generated by GNU Autoconf 2.61 for Haskell network package 2.3.0.11. # # Report bugs to . # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='Haskell network package' PACKAGE_TARNAME='network' -PACKAGE_VERSION='2.3.0.9' -PACKAGE_STRING='Haskell network package 2.3.0.9' +PACKAGE_VERSION='2.3.0.11' +PACKAGE_STRING='Haskell network package 2.3.0.11' PACKAGE_BUGREPORT='libraries@haskell.org' ac_unique_file="include/HsNet.h" @@ -1188,7 +1188,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Haskell network package 2.3.0.9 to adapt to many kinds of systems. +\`configure' configures Haskell network package 2.3.0.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1253,7 +1253,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Haskell network package 2.3.0.9:";; + short | recursive ) echo "Configuration of Haskell network package 2.3.0.11:";; esac cat <<\_ACEOF @@ -1336,7 +1336,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Haskell network package configure 2.3.0.9 +Haskell network package configure 2.3.0.11 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1350,7 +1350,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Haskell network package $as_me 2.3.0.9, which was +It was created by Haskell network package $as_me 2.3.0.11, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -5587,7 +5587,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Haskell network package $as_me 2.3.0.9, which was +This file was extended by Haskell network package $as_me 2.3.0.11, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5636,7 +5636,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Haskell network package config.status 2.3.0.9 +Haskell network package config.status 2.3.0.11 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Haskell network package], [2.3.0.10], [libraries@haskell.org], [network]) +AC_INIT([Haskell network package], [2.3.0.11], [libraries@haskell.org], [network]) ac_includes_default="$ac_includes_default #ifdef HAVE_NETDB_H diff --git a/include/HsNet.h b/include/HsNet.h --- a/include/HsNet.h +++ b/include/HsNet.h @@ -174,7 +174,7 @@ } #endif -#if defined(HAVE_WINSOCK_H) && !defined(cygwin32_HOST_OS) +#if defined(HAVE_WINSOCK2_H) && !defined(cygwin32_HOST_OS) # define WITH_WINSOCK 1 #endif diff --git a/include/HsNetworkConfig.h b/include/HsNetworkConfig.h --- a/include/HsNetworkConfig.h +++ b/include/HsNetworkConfig.h @@ -133,13 +133,13 @@ #define PACKAGE_NAME "Haskell network package" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Haskell network package 2.3.0.9" +#define PACKAGE_STRING "Haskell network package 2.3.0.10" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "network" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.3.0.9" +#define PACKAGE_VERSION "2.3.0.10" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/network.cabal b/network.cabal --- a/network.cabal +++ b/network.cabal @@ -1,5 +1,5 @@ name: network -version: 2.3.0.10 +version: 2.3.0.11 license: BSD3 license-file: LICENSE maintainer: Johan Tibell @@ -66,7 +66,7 @@ bytestring < 0.10, HUnit < 1.3, network, - test-framework < 0.5, + test-framework < 0.6, test-framework-hunit < 0.3 test-suite uri @@ -78,7 +78,7 @@ base < 4.6, HUnit < 1.3, network, - test-framework < 0.5, + test-framework < 0.6, test-framework-hunit < 0.3 source-repository head