From 5b40cfa2720efa15513a43a507a343d4ffbe3953 Mon Sep 17 00:00:00 2001
From: Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
Date: Fri, 15 Oct 2010 12:17:15 -0300
Subject: [PATCH] Misplaced declaration of UpnpCloseSocket.

---
 upnp/inc/UpnpInet.h                      |  7 +++++++
 upnp/inc/upnp.h                          | 16 ----------------
 upnp/src/genlib/net/http/httpreadwrite.c |  1 +
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/upnp/inc/UpnpInet.h b/upnp/inc/UpnpInet.h
index ad632a8..24c6cec 100644
--- a/upnp/inc/UpnpInet.h
+++ b/upnp/inc/UpnpInet.h
@@ -12,8 +12,11 @@
 
 
 #ifdef WIN32
+	#include <iphlpapi.h>
 	#include <winsock2.h>
 	#include <Ws2tcpip.h>
+
+	#define UpnpCloseSocket closesocket
 #else
 	#include <sys/param.h>
 	#if (defined(BSD) && BSD >= 199306) || defined (__FreeBSD_kernel__)
@@ -23,6 +26,10 @@
 		#include <sys/socket.h>
 	#endif
 	#include <netinet/in.h>
+
+	#define SOCKET int
+	#define INVALID_SOCKET ((SOCKET)(-1))
+	#define UpnpCloseSocket close
 #endif
 
 
diff --git a/upnp/inc/upnp.h b/upnp/inc/upnp.h
index 3325961..68d2eef 100644
--- a/upnp/inc/upnp.h
+++ b/upnp/inc/upnp.h
@@ -69,22 +69,6 @@
 #endif
 
 
-#ifdef WIN32
-	#include <iphlpapi.h>
-#else
-	#define SOCKET int
-	#define INVALID_SOCKET (SOCKET)(~0)
-#endif
-
-
-#ifdef WIN32
-	#define UpnpCloseSocket closesocket
-	#define fseeko fseek
-#else
-	#define UpnpCloseSocket close
-#endif
-
-
 #define LINE_SIZE  180
 #define NAME_SIZE  256
 #define MNFT_NAME_SIZE  64
diff --git a/upnp/src/genlib/net/http/httpreadwrite.c b/upnp/src/genlib/net/http/httpreadwrite.c
index 901670c..a533cb6 100644
--- a/upnp/src/genlib/net/http/httpreadwrite.c
+++ b/upnp/src/genlib/net/http/httpreadwrite.c
@@ -68,6 +68,7 @@
 
 #ifdef WIN32
 	#include <malloc.h>
+	#define fseeko fseek
 #else
 	#include <arpa/inet.h>
 	#include <fcntl.h>