From 536582171dc02b8d1bc45b21f3860b3b5c3f15ed Mon Sep 17 00:00:00 2001
From: Philipp Schafft <lion@lion.leolix.org>
Date: Wed, 24 Dec 2014 09:22:45 +0000
Subject: [PATCH] Prevent various redefined definitions in win32-specific code

From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Mon, 22 Dec 2014 18:02:09 +0100
---
 httpp/httpp.c | 4 ----
 net/sock.c    | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/httpp/httpp.c b/httpp/httpp.c
index 2363931..e42bff6 100644
--- a/httpp/httpp.c
+++ b/httpp/httpp.c
@@ -41,10 +41,6 @@
 #include <avl/avl.h>
 #include "httpp.h"
 
-#if defined(_WIN32) && !defined(HAVE_STRCASECMP)
-#define strcasecmp stricmp
-#endif
-
 #define MAX_HEADERS 32
 
 /* internal functions */
diff --git a/net/sock.c b/net/sock.c
index d9bc18e..430d6f3 100644
--- a/net/sock.c
+++ b/net/sock.c
@@ -53,14 +53,6 @@
 #include <netdb.h>
 #else
 #include <winsock2.h>
-#define vsnprintf _vsnprintf
-#define EINPROGRESS WSAEINPROGRESS
-#define ENOTSOCK WSAENOTSOCK
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define EALREADY WSAEALREADY
-#define socklen_t    int
-#ifndef __MINGW32__
-#define va_copy(ap1, ap2) memcpy(&ap1, &ap2, sizeof(va_list))
 #endif
 #endif