revert to upstream

[debian/amanda] / gnulib / regenerate / getaddrinfo-cygwin.patch

diff --git a/gnulib/regenerate/getaddrinfo-cygwin.patch b/gnulib/regenerate/getaddrinfo-cygwin.patch
index 1577b0305e49b525206046f9cf1fcf873f472646..0971d4769d4e78bbf0135f1ec07226a5273b2de7 100644 (file)
--- a/gnulib/regenerate/getaddrinfo-cygwin.patch
+++ b/gnulib/regenerate/getaddrinfo-cygwin.patch
@@ -1,27 +1,15 @@
-<<<<<<< HEAD:gnulib/regenerate/getaddrinfo-cygwin.patch
---- gnulib/getaddrinfo.c       2007-03-06 13:17:25.733225500 -0600
-+++ gnulib/getaddrinfo.c       2007-03-06 13:17:32.345638750 -0600
-@@ -40,6 +40,8 @@
- #include "inet_ntop.h"
- #include "snprintf.h"
-=======
 --- gnulib/getaddrinfo.c.orig  2007-10-25 16:46:34.728843739 -0500
 +++ gnulib/getaddrinfo.c       2007-10-25 16:47:17.395395249 -0500
 @@ -42,6 +42,8 @@
  
  #include "inet_ntop.h"
->>>>>>> fb2bd066c2f8b34addafe48d62550e3033a59431:gnulib/regenerate/getaddrinfo-cygwin.patch
  
 +extern int h_errno;
 +
  /* BeOS has AF_INET, but not PF_INET.  */
  #ifndef PF_INET
  # define PF_INET AF_INET
-<<<<<<< HEAD:gnulib/regenerate/getaddrinfo-cygwin.patch
-@@ -147,25 +149,29 @@
-=======
 @@ -149,25 +151,29 @@
->>>>>>> fb2bd066c2f8b34addafe48d62550e3033a59431:gnulib/regenerate/getaddrinfo-cygwin.patch
      return getaddrinfo_ptr (nodename, servname, hints, res);
  #endif
  
@@ -58,29 +46,7 @@
  #else
        nodename = "0.0.0.0";
  #endif
-<<<<<<< HEAD:gnulib/regenerate/getaddrinfo-cygwin.patch
-@@ -175,11 +181,13 @@
-     {
-       struct servent *se = NULL;
-       const char *proto =
--      (hints && hints->ai_socktype == SOCK_DGRAM) ? "udp" : "tcp";
-+      (hints && (hints->ai_socktype == SOCK_DGRAM)) ? "udp" : "tcp";
- 
--      if (!(hints->ai_flags & AI_NUMERICSERV))
--      /* FIXME: Use getservbyname_r if available. */
--      se = getservbyname (servname, proto);
-+      if ((hints == NULL) || !(hints->ai_flags & AI_NUMERICSERV))
-+        {
-+        /* FIXME: Use getservbyname_r if available. */
-+        se = getservbyname (servname, proto);
-+        }
- 
-       if (!se)
-       {
-@@ -196,7 +204,7 @@
-=======
 @@ -198,7 +204,7 @@
->>>>>>> fb2bd066c2f8b34addafe48d62550e3033a59431:gnulib/regenerate/getaddrinfo-cygwin.patch
      }
  
    /* FIXME: Use gethostbyname_r if available. */
@@ -89,11 +55,7 @@
    if (!he || he->h_addr_list[0] == NULL)
      return EAI_NONAME;
  
-<<<<<<< HEAD:gnulib/regenerate/getaddrinfo-cygwin.patch
-@@ -277,7 +285,7 @@
-=======
 @@ -279,7 +285,7 @@
->>>>>>> fb2bd066c2f8b34addafe48d62550e3033a59431:gnulib/regenerate/getaddrinfo-cygwin.patch
        return EAI_NODATA;
      }
  
@@ -102,11 +64,7 @@
      {
        const char *cn;
        if (he->h_name)
-<<<<<<< HEAD:gnulib/regenerate/getaddrinfo-cygwin.patch
-@@ -341,9 +349,7 @@
-=======
 @@ -343,9 +349,7 @@
->>>>>>> fb2bd066c2f8b34addafe48d62550e3033a59431:gnulib/regenerate/getaddrinfo-cygwin.patch
  #endif
  
    /* FIXME: Support other flags. */
@@ -117,11 +75,7 @@
      return EAI_BADFLAGS;
  
    if (sa == NULL || salen < sizeof (sa->sa_family))
-<<<<<<< HEAD:gnulib/regenerate/getaddrinfo-cygwin.patch
-@@ -367,34 +373,89 @@
-=======
 @@ -369,34 +373,89 @@
->>>>>>> fb2bd066c2f8b34addafe48d62550e3033a59431:gnulib/regenerate/getaddrinfo-cygwin.patch
        return EAI_FAMILY;
      }