From 55a5d90e5ba396355372943bd37b77bf356d3109 Mon Sep 17 00:00:00 2001
From: Richard Aas <richard@db.org>
Date: Wed, 17 Oct 2012 06:39:33 +0000
Subject: [PATCH] sa: fix ntop/pton win32 includes

---
 src/sa/ntop.c | 10 ++++++++--
 src/sa/pton.c |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/sa/ntop.c b/src/sa/ntop.c
index 16914ce..ebb027a 100644
--- a/src/sa/ntop.c
+++ b/src/sa/ntop.c
@@ -4,15 +4,21 @@
  * Copyright (C) 2010 Creytiv.com
  */
 #ifdef HAVE_INET_NTOP
+#ifdef WIN32
+#ifdef _MSC_VER
+#pragma warning (disable: 4090)
+#endif
+#include <windows.h>
+#else
 #define __USE_BSD 1    /**< Use BSD code */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #define __USE_POSIX 1  /**< Use POSIX code */
 #include <netdb.h>
-#else
-#include <string.h>
+#endif /* WIN32 */
 #endif
+#include <string.h>
 #include <re_types.h>
 #include <re_fmt.h>
 #include <re_mbuf.h>
diff --git a/src/sa/pton.c b/src/sa/pton.c
index 8f892a7..2707527 100644
--- a/src/sa/pton.c
+++ b/src/sa/pton.c
@@ -4,12 +4,16 @@
  * Copyright (C) 2010 Creytiv.com
  */
 #ifdef HAVE_INET_PTON
+#ifdef WIN32
+#include <windows.h>
+#else
 #define _BSD_SOURCE 1    /**< Use BSD code */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #define __USE_POSIX 1  /**< Use POSIX code */
 #include <netdb.h>
+#endif /* WIN32 */
 #endif
 #include <string.h>
 #include <re_types.h>