independent exporting from HAVE_DECL_IF_NAMETOINDEX.

haskell · Dec 28, 2017 · 3fa7caa · 3fa7caa
1 parent 13512ac
commit 3fa7caa
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/Network/BSD.hsc b/Network/BSD.hsc
@@ -90,11 +90,8 @@ module Network.BSD  {-# DEPRECATED "This platform dependent module is no longer
     , endNetworkEntry
 #endif
 
-#if HAVE_DECL_IF_NAMETOINDEX
     -- * Interface names
     , ifNameToIndex
-#endif
-
     ) where
 
 import Control.Concurrent (MVar, newMVar, withMVar)

diff --git a/Network/Socket.hsc b/Network/Socket.hsc
@@ -129,10 +129,8 @@ module Network.Socket
     -- ** Scope ID
     , ScopeID
 #endif
-#if HAVE_DECL_IF_NAMETOINDEX
     , ifNameToIndex
     , ifIndexToName
-#endif
     -- ** Protocol number
     , ProtocolNumber
     , defaultProtocol

diff --git a/Network/Socket/If.hs b/Network/Socket/If.hs
@@ -3,13 +3,10 @@
 #include "HsNetDef.h"
 
 module Network.Socket.If (
-#if HAVE_DECL_IF_NAMETOINDEX
     ifNameToIndex
   , ifIndexToName
-#endif
   ) where
 
-#if HAVE_DECL_IF_NAMETOINDEX
 import Foreign.C.String (CString, withCString, peekCString)
 import Foreign.C.Types (CUInt(..))
 import Foreign.Marshal.Alloc (allocaBytes)
@@ -40,4 +37,3 @@ foreign import CALLCONV safe "if_nametoindex"
 
 foreign import CALLCONV safe "if_indextoname"
    c_if_indextoname :: CUInt -> CString -> IO CString
-#endif
diff --git a/configure.ac b/configure.ac
@@ -89,7 +89,7 @@ AC_CHECK_DECLS([IPV6_V6ONLY])
 AC_CHECK_DECLS([IPPROTO_IP, IPPROTO_TCP, IPPROTO_IPV6])
 AC_CHECK_DECLS([SO_PEERCRED])
 dnl AC_CHECK_DECLS is used instead of AC_CHECK_FUNCS for Windows
-AC_CHECK_DECLS([getaddrinfo, if_nametoindex])
+AC_CHECK_DECLS([getaddrinfo])
 
 AC_CHECK_MEMBERS([struct msghdr.msg_control, struct msghdr.msg_accrights])
 AC_CHECK_MEMBERS([struct sockaddr.sa_len])