gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / lib / canon-host.c

diff --git a/lib/canon-host.c b/lib/canon-host.c
index b5aa1b7..d610689 100644 (file)
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -1,6 +1,6 @@
 /* Host name canonicalization
 
-   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005-2013 Free Software Foundation, Inc.
 
    Written by Derek Price <derek@ximbiot.com>.
 
@@ -22,8 +22,7 @@
 #include "canon-host.h"
 
 #include <string.h>
-
-#include "getaddrinfo.h"
+#include <netdb.h>
 
 /* Store the last error for the single-threaded version of this function.  */
 static int last_cherror;
@@ -70,11 +69,11 @@ canon_host_r (char const *host, int *cherror)
   if (!status)
     {
       /* http://lists.gnu.org/archive/html/bug-coreutils/2006-09/msg00300.html
-        says Darwin 7.9.0 getaddrinfo returns 0 but sets
-        res->ai_canonname to NULL.  */
+         says Darwin 7.9.0 getaddrinfo returns 0 but sets
+         res->ai_canonname to NULL.  */
       retval = strdup (res->ai_canonname ? res->ai_canonname : host);
       if (!retval && cherror)
-       *cherror = EAI_MEMORY;
+        *cherror = EAI_MEMORY;
       freeaddrinfo (res);
     }
   else if (cherror)