mswsp: Remove null check (CID1355407)

[jlayton/wireshark.git] / wsutil / inet_aton.h

diff --git a/wsutil/inet_aton.h b/wsutil/inet_aton.h
index 670898124c19c3963bec597df9ef44a2a0028168..3d89dc23c2f58ecfeeac9d7a5e61ac591c6dc8c1 100644 (file)
--- a/wsutil/inet_aton.h
+++ b/wsutil/inet_aton.h
@@ -1,6 +1,4 @@
 /* inet_aton.h
- *
- * $Id$
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -28,7 +26,27 @@
 #ifndef __INET_ATON_H__
 #define __INET_ATON_H__
 
+#include "ws_symbol_export.h"
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>     /* needed to define AF_ values on UNIX */
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+
+#ifndef HAVE_INET_ATON
 struct in_addr;
-extern int inet_aton(const char* cp_arg, struct in_addr *addr);
+WS_DLL_PUBLIC int inet_aton(const char* cp_arg, struct in_addr *addr);
+#endif
 
 #endif