From: Nils Durner <durner@gnunet.org>
Date: Sat, 27 Nov 2010 15:47:58 +0000 (+0000)
Subject: MinGW
X-Git-Tag: initial-import-from-subversion-38251~19610
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8de189bfcf8a5d6d4713c9151a7746a94c54c9a8;p=oweals%2Fgnunet.git

MinGW
---

diff --git a/src/nat/nat.c b/src/nat/nat.c
index eb203265c..ca6df0573 100644
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -131,7 +131,7 @@ get_nat_state_str (enum GNUNET_NAT_PortState state)
 static int
 get_traversal_status (const struct GNUNET_NAT_Handle *h)
 {
-  return MAX (h->natpmp_status, h->upnp_status);
+  return GNUNET_MAX (h->natpmp_status, h->upnp_status);
 }
 
 
diff --git a/src/nat/upnp-commands.c b/src/nat/upnp-commands.c
index d9962117d..00655f753 100644
--- a/src/nat/upnp-commands.c
+++ b/src/nat/upnp-commands.c
@@ -320,12 +320,12 @@ parse_url (const char *url, char *hostname, unsigned short *port, char **path)
 
   if (!p2 || (p2 > p3))
     {
-      strncpy (hostname, p1, MIN (MAX_HOSTNAME_LEN, (int) (p3 - p1)));
+      strncpy (hostname, p1, GNUNET_MIN (MAX_HOSTNAME_LEN, (int) (p3 - p1)));
       *port = 80;
     }
   else
     {
-      strncpy (hostname, p1, MIN (MAX_HOSTNAME_LEN, (int) (p2 - p1)));
+      strncpy (hostname, p1, GNUNET_MIN (MAX_HOSTNAME_LEN, (int) (p2 - p1)));
       *port = 0;
       p2++;
 
diff --git a/src/nat/upnp-discover.c b/src/nat/upnp-discover.c
index 5e955db45..cb1855ccd 100644
--- a/src/nat/upnp-discover.c
+++ b/src/nat/upnp-discover.c
@@ -1201,7 +1201,12 @@ UPNP_discover_ (const char *multicastif,
         {
           if (multicastif)
             {
+#ifndef MINGW
               if_index = if_nametoindex (multicastif);
+#else
+              // FIXME
+              if_index = 0;
+#endif
               if (!if_index)
                 PRINT_SOCKET_ERROR ("if_nametoindex");
 
diff --git a/src/nat/upnp.c b/src/nat/upnp.c
index 8dd7d626c..23168d20a 100644
--- a/src/nat/upnp.c
+++ b/src/nat/upnp.c
@@ -302,7 +302,12 @@ get_ip_address_cb (int error, char *ext_addr, void *cls)
         }
 
       /* Try IPv4 and IPv6 as we don't know what's the format */
+#ifndef MINGW
       if (inet_aton (ext_addr, &addr) != 0)
+#else
+      addr.S_un.S_addr = inet_addr(ext_addr);
+      if (addr.S_un.S_addr == INADDR_NONE)
+#endif
         {
           handle->ext_addr = GNUNET_malloc (sizeof (struct sockaddr_in));
           handle->ext_addr->sa_family = AF_INET;