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
This commit is contained in:
Marcelo Roberto Jimenez
2010-12-18 19:29:24 -02:00
parent bb5a80c05b
commit b2a88aa70b
12 changed files with 92 additions and 157 deletions

View File

@@ -1,9 +1,6 @@
#ifndef INET_PTON
#define INET_PTON
#ifdef WIN32
#ifdef IPV6_
@@ -12,12 +9,10 @@
#include "unixutil.h"
#include <errno.h>
#include <stdio.h>
#include <string.h>
/*!
* \file
*
@@ -30,59 +25,14 @@
*
*/
/*!
* \brief format an IPv4 address
*
* \return `dst' (as a const)
*
* \note
* \li (1) uses no statics
* \li (2) takes a u_char* not an in_addr as input
*
*/
extern const char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
/*!
* \brief convert IPv6 binary address into presentation (printable) format
*/
#ifdef INET_IPV6
extern const char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
#endif /* INET_IPV6 */
/*!
* \brief like inet_aton() but without all the hexadecimal and shorthand.
*
* \return 1 if `src' is a valid dotted quad, else 0.
*
* \note does not touch `dst' unless it's returning 1.
*/
extern inet_pton4(const char *src,u_char *dst);
/*!
* \brief convert presentation level address to network order binary form.
*
* \return 1 if `src' is a valid [RFC1884 2.2] address, else 0.
*
* \note
* \li (1) does not touch `dst' unless it's returning 1.
* \li (2) :: in a full address is silently ignored.
*/
#ifdef INET_IPV6
extern int inet_pton6(const char *src, u_char *dst);
#endif /* INET_IPV6 */
/*!
* \brief convert a network format address to presentation format.
*
* \return
* pointer to presentation format address (`dst'), or NULL (see errno).
*/
extern const char *inet_ntop(int af,const void *src,char *dst,socklen_t size);
extern const char *inet_ntop(int af, const void *src, char *dst,
socklen_t size);
/*!
* \brief convert from presentation format (which usually means ASCII printable)
@@ -93,11 +43,8 @@ extern const char *inet_ntop(int af,const void *src,char *dst,socklen_t size);
* \li 0 if the address wasn't valid (`dst' is untouched in this case)
* \li -1 if some other error occurred (`dst' is untouched in this case, too)
*/
extern int inet_pton(int af,const char *src,void *dst);
extern int inet_pton(int af, const char *src, void *dst);
#endif /* WIN32 */
#endif /* INET_PTON */