From 91f85c222be7ef247c8f2e18815eb23c336ed081 Mon Sep 17 00:00:00 2001
From: Richard Nyberg <rnyberg@murmeldjur.se>
Date: Sun, 25 Feb 2007 17:34:12 +0000
Subject: Update to libevent from patches-1.3 r335.

---
 libevent/WIN32-Code/misc.c  | 2 +-
 libevent/WIN32-Code/win32.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'libevent/WIN32-Code')

diff --git a/libevent/WIN32-Code/misc.c b/libevent/WIN32-Code/misc.c
index 6f63ddf..bdebc3a 100644
--- a/libevent/WIN32-Code/misc.c
+++ b/libevent/WIN32-Code/misc.c
@@ -88,4 +88,4 @@ socketpair(int d, int type, int protocol, int *sv)
 	sv[1] = (int)fd;
 
 	return (0);
-}
\ No newline at end of file
+}
diff --git a/libevent/WIN32-Code/win32.c b/libevent/WIN32-Code/win32.c
index 701d1c3..867d1f2 100644
--- a/libevent/WIN32-Code/win32.c
+++ b/libevent/WIN32-Code/win32.c
@@ -25,11 +25,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#ifdef _MSC_VER
 #include "config.h"
-
-#include <winsock2.h>
+#else
+/* Avoid the windows/msvc thing. */
+#include "../config.h"
+#endif
 
 #include <windows.h>
+#include <winsock2.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/tree.h>
-- 
cgit 1.4.1