aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--wsutil/inet_addr-int.h4
-rw-r--r--wsutil/inet_addr.c4
-rw-r--r--wsutil/inet_addr.h4
4 files changed, 9 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 759e7e52b3..1ab3d29c4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2945,7 +2945,7 @@ have_inet_pton=no)
if test "$have_inet_pton" = no; then
INET_PTON_LO="inet_pton.lo"
else
- AC_DEFINE(HAVE_INET_NTOP, 1,
+ AC_DEFINE(HAVE_INET_PTON, 1,
[Define to 1 if you have the `inet_pton' function.])
INET_PTON_LO=""
fi
diff --git a/wsutil/inet_addr-int.h b/wsutil/inet_addr-int.h
index 631787dfca..c71b1cd4ad 100644
--- a/wsutil/inet_addr-int.h
+++ b/wsutil/inet_addr-int.h
@@ -28,6 +28,10 @@
#include <arpa/inet.h>
#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h> /* needed to define AF_ values on UNIX */
#endif
diff --git a/wsutil/inet_addr.c b/wsutil/inet_addr.c
index b5f4cea62e..d56c955def 100644
--- a/wsutil/inet_addr.c
+++ b/wsutil/inet_addr.c
@@ -36,7 +36,7 @@ _inet_pton(int af, const gchar *src, gpointer dst)
}
const gchar *
-ws_inet_ntop4(gconstpointer src, gchar *dst, gsize dst_size)
+ws_inet_ntop4(gconstpointer src, gchar *dst, guint dst_size)
{
return inet_ntop(AF_INET, src, dst, dst_size);
}
@@ -48,7 +48,7 @@ ws_inet_pton4(const gchar *src, guint32 *dst)
}
const gchar *
-ws_inet_ntop6(gconstpointer src, gchar *dst, gsize dst_size)
+ws_inet_ntop6(gconstpointer src, gchar *dst, guint dst_size)
{
return inet_ntop(AF_INET6, src, dst, dst_size);
}
diff --git a/wsutil/inet_addr.h b/wsutil/inet_addr.h
index 330f6e0d88..6cf43a1cd9 100644
--- a/wsutil/inet_addr.h
+++ b/wsutil/inet_addr.h
@@ -29,13 +29,13 @@
#include <epan/ipv6.h>
WS_DLL_PUBLIC const gchar *
-ws_inet_ntop4(gconstpointer src, gchar *dst, gsize dst_size);
+ws_inet_ntop4(gconstpointer src, gchar *dst, guint dst_size);
WS_DLL_PUBLIC gboolean
ws_inet_pton4(const gchar *src, guint32 *dst);
WS_DLL_PUBLIC const gchar *
-ws_inet_ntop6(gconstpointer src, gchar *dst, gsize dst_size);
+ws_inet_ntop6(gconstpointer src, gchar *dst, guint dst_size);
WS_DLL_PUBLIC gboolean
ws_inet_pton6(const gchar *src, struct e_in6_addr *dst);