SF Tracker: Patches - Fedora mingw32 compilation - ID: 3138849

Details:
Hello. I trying compile libupnp-1.6.10 on the Fedora 14 MinGW
Environment and get many errors. I create patch to fix it. With this
patch i can get static library. This patch is very raw.

Submitted: Ivan Romanov (ivanromanov) - 2010-12-16 23:29:19 UTC
(cherry picked from commit b2a88aa70b)

upnp/src/genlib/miniserver/miniserver.c

@@ -29,10 +29,8 @@
  *
  **************************************************************************/
 
-
 #include "config.h"
 
-
 /*!
  * \file
  *
@@ -46,10 +44,8 @@
  *
  */
 
-
 #include "miniserver.h"
 
-
 #include "httpreadwrite.h"
 #include "ithread.h"
 #include "ssdplib.h"
@@ -59,7 +55,6 @@
 #include "upnpapi.h"
 #include "upnputil.h"
 
-
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
@@ -67,11 +62,9 @@
 #include <string.h>
 #include <sys/types.h>
 
-
 /*! . */
 #define APPLICATION_LISTENING_PORT 49152
 
-
 struct mserv_request_t {
 	/*! Connection handle. */
 	SOCKET connfd;
@@ -79,7 +72,6 @@ struct mserv_request_t {
 	struct sockaddr_storage foreign_sockaddr;
 };
 
-
 /*! . */
 typedef enum {
 	/*! . */
@@ -90,11 +82,9 @@ typedef enum {
 	MSERV_STOPPING
 } MiniServerState;
 
-
 /*! . */
 uint16_t miniStopSockPort;
 
-
 /*!
  * module vars
  */
@@ -103,13 +93,11 @@ static MiniServerCallback gSoapCallback = NULL;
 static MiniServerCallback gGenaCallback = NULL;
 static MiniServerState gMServState = MSERV_IDLE;
 
-
 void SetHTTPGetCallback(MiniServerCallback callback)
 {
 	gGetCallback = callback;
 }
 
-
 #ifdef INCLUDE_DEVICE_APIS
 void SetSoapCallback(MiniServerCallback callback)
 {
@@ -122,7 +110,6 @@ void SetGenaCallback(MiniServerCallback callback)
 	gGenaCallback = callback;
 }
 
-
 #ifdef INTERNAL_WEB_SERVER
 /*!
  * \brief Based on the type pf message, appropriate callback is issued.
@@ -169,7 +156,6 @@ static int dispatch_request(
 	return 0;
 }
 
-
 /*!
  * \brief Send Error Message.
  */
@@ -186,7 +172,6 @@ static UPNP_INLINE void handle_error(
 	http_SendStatusResponse(info, http_error_code, major, minor);
 }
 
-
 /*!
  * \brief Free memory assigned for handling request and unitialize socket
  * functionality.
@@ -201,7 +186,6 @@ static void free_handle_request_arg(
 	free(request);
 }
 
-
 /*!
  * \brief Receive the request and dispatch it for handling.
  */
@@ -262,7 +246,6 @@ error_handler:
 		"miniserver %d: COMPLETE\n", connfd);
 }
 
-
 /*!
  * \brief Initilize the thread pool to handle a request, sets priority for the
  * job and adds the job to the thread pool.
@@ -456,7 +439,6 @@ static void RunMiniServer(
 	return;
 }
 
-
 /*!
  * \brief Returns port to which socket, sockfd, is bound.
  *
@@ -488,7 +470,6 @@ static int get_port(
 	return 0;
 }
 
-
 #ifdef INTERNAL_WEB_SERVER
 /*!
  * \brief Creates a STREAM socket, binds to INADDR_ANY and listens for
@@ -519,12 +500,12 @@ static int get_miniserver_sockets(
 	struct sockaddr_storage __ss_v4;
 	struct sockaddr_in* serverAddr4 = (struct sockaddr_in*)&__ss_v4;
 	SOCKET listenfd4;
-	unsigned short actual_port4;
+	uint16_t actual_port4;
 #ifdef UPNP_ENABLE_IPV6
 	struct sockaddr_storage __ss_v6;
 	struct sockaddr_in6* serverAddr6 = (struct sockaddr_in6*)&__ss_v6;
 	SOCKET listenfd6;
-	unsigned short actual_port6;
+	uint16_t actual_port6;
 #endif
 	int ret_code;
 	int reuseaddr_on = 0;
@@ -635,7 +616,7 @@ static int get_miniserver_sockets(
 #endif  /* IPv6 */
 	} else {
 		if (listenfd4 != INVALID_SOCKET) {
-			unsigned short orig_listen_port4 = listen_port4;
+			uint16_t orig_listen_port4 = listen_port4;
 			do {
 				serverAddr4->sin_port = htons(listen_port4++);
 				sockError = bind(listenfd4,
@@ -673,7 +654,7 @@ static int get_miniserver_sockets(
 		}
 #ifdef UPNP_ENABLE_IPV6
 		if (listenfd6 != INVALID_SOCKET) {
-			unsigned short orig_listen_port6 = listen_port6;
+			uint16_t orig_listen_port6 = listen_port6;
 			do {
 				serverAddr6->sin6_port = htons(listen_port6++);
 				sockError = bind(listenfd6,
@@ -763,7 +744,6 @@ static int get_miniserver_sockets(
 }
 #endif /* INTERNAL_WEB_SERVER */
 
-
 /*!
  * \brief Creates the miniserver STOP socket. This socket is created and 
  *  listened on to know when it is time to stop the Miniserver.
@@ -832,10 +812,10 @@ static UPNP_INLINE void InitMiniServerSockArray(MiniServerSockArray *miniSocket)
 int StartMiniServer(
 	/*! [in,out] Port on which the server listens for incoming IPv4
 	 * connections. */
-	unsigned short *listen_port4, 
+	uint16_t *listen_port4, 
 	/*! [in,out] Port on which the server listens for incoming IPv6
 	 * connections. */
-	unsigned short *listen_port6)
+	uint16_t *listen_port6)
 {
 	int ret_code;
 	int count;
@@ -921,7 +901,6 @@ int StartMiniServer(
 	return UPNP_E_SUCCESS;
 }
 
-
 int StopMiniServer()
 {
 	char errorBuffer[ERROR_BUFFER_LEN];
@@ -960,4 +939,3 @@ int StopMiniServer()
 
 	return 0;
 }
-