-/* Create a new client socket; returns (FILE *)NULL on error */
-#if INET6_ENABLE
-int SockOpen(const char *host, const char *service, const char *options,
- const char *plugin);
-#else /* INET6_ENABLE */
-int SockOpen(const char *host, int clientPort, const char *options,
- const char *plugin);
-#endif /* INET6_ENABLE */
+struct addrinfo;
+
+#include <config.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#elif HAVE_NET_SOCKET_H
+#include <net/socket.h>
+#endif
+#include <netdb.h>
+
+/** Create a new client socket; returns -1 on error */
+int SockOpen(const char *host, const char *service, const char *plugin, struct addrinfo **);