X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcanon-host.c;h=39d8789111a43f70901e57028537871bbbb24808;hb=580345964476b26f12ef009230d03f5bd86ecc4e;hp=180c86a07a20846c4efa70fd8289f7589d393584;hpb=7f81c241d786280253ce345d13705ecec4f7635a;p=gnulib.git

diff --git a/lib/canon-host.c b/lib/canon-host.c
index 180c86a07..39d878911 100644
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -15,28 +15,32 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
+#include <sys/types.h>
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 #ifdef HAVE_STRING_H
-#include <string.h>
+# include <string.h>
 #endif
 #ifdef HAVE_NETDB_H
-#include <netdb.h>
+# include <netdb.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
 #endif
 
 #ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+# include <netinet/in.h>
 #endif
 #ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
 #endif
 
 /* Returns the canonical hostname associated with HOST (allocated in a static
@@ -50,30 +54,28 @@ canon_host (host)
 
   if (he)
     {
-#ifdef HAVE_GETHOSTBYADDR
+# ifdef HAVE_GETHOSTBYADDR
       char *addr = 0;
 
       /* Try and get an ascii version of the numeric host address.  */
       switch (he->h_addrtype)
 	{
-#ifdef HAVE_INET_NTOA
+#  ifdef HAVE_INET_NTOA
 	case AF_INET:
-	  addr = inet_ntoa (*(struct in_addr *)he->h_addr);
+	  addr = inet_ntoa (*(struct in_addr *) he->h_addr);
 	  break;
-#endif /* HAVE_INET_NTOA */
+#  endif /* HAVE_INET_NTOA */
 	}
 
       if (addr && strcmp (he->h_name, addr) == 0)
 	/* gethostbyname() cheated!  Lookup the host name via the address
 	   this time to get the actual host name.  */
 	he = gethostbyaddr (he->h_addr, he->h_length, he->h_addrtype);
-#endif HAVE_GETHOSTBYADDR
+# endif /* HAVE_GETHOSTBYADDR */
 
       if (he)
-	return he->h_name;
+	return (char *) (he->h_name);
     }
-
-#else /* ! HAVE_GETHOSTBYNAME */
-  return 0;
 #endif /* HAVE_GETHOSTBYNAME */
+  return 0;
 }