Remove shipped inet.h file and use system version instead

diff --git a/include/inet.h b/include/inet.h
deleted file mode 100644 (file)
index 955f907..0000000
--- a/include/inet.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- *     @(#)inet.h      5.4 (Berkeley) 6/1/90
- */
-
-/* External definitions for functions in inet(3) */
-#include "config.h" /* for system definitions */
-
-#ifdef __alpha
-#define        __u_l   unsigned int
-#else
-#define        __u_l   unsigned long
-#endif
-
-#ifdef __STDC__
-extern __u_l inet_addr(char *);
-extern char *inet_ntoa(char *);
-extern __u_l inet_netof (struct in_addr);
-extern __u_l inet_makeaddr(int , int);
-extern __u_l inet_network(char *);
-extern __u_l inet_lnaof(struct in_addr);
-#else
-extern __u_l inet_addr();
-extern char *inet_ntoa();
-#ifndef HPUX
-extern __u_l inet_makeaddr();
-#endif
-#endif
-#ifndef  HPUX
-extern __u_l inet_network();
-extern __u_l inet_lnaof();
-#endif
-#undef __u_l

diff --git a/src/res.c b/src/res.c
index 23f4fafb541adc4b15c3b22cf9e1084446d0b6d8..6f29771ffcdbf88765ddaae9c18345ba2a54fb0a 100644 (file)
--- a/src/res.c
+++ b/src/res.c
@@ -19,7 +19,7 @@
 #include <resolv.h>
 #include <arpa/nameser.h>
 #include <arpa/nameser_compat.h>
-#include "inet.h"                /* inet_addr() */
+//#include "inet.h"              /* inet_addr() */
 
 #undef DEBUG                     /* because there is a lot of debug code in here :-) */
 

diff --git a/src/s_bsd.c b/src/s_bsd.c
index 909db82a0f9fb02b5208c1540d659d0f2e4798e9..642eaa9363ff8f87b7edecfca0b4c2a02c5b3d31 100644 (file)
--- a/src/s_bsd.c
+++ b/src/s_bsd.c
@@ -32,11 +32,10 @@
 #if (!defined(SVR3) || defined(sgi) || defined(_SEQUENT_))
 #include <sys/un.h>
 #endif
-#include "inet.h"
+#include <arpa/inet.h>
 #include <stdio.h>
 #include <signal.h>
 #include <fcntl.h>
-//#include "nameser.h"
 #include <resolv.h>
 #include "sock.h"                /* If FD_ZERO isn't define up to this point,  */
                        /* define it (BSD4.2 needs this) */

diff --git a/src/s_conf.c b/src/s_conf.c
index 8e6337b99707770abe760d281c95c084c0b9dcdc..56a4367e06bc2943a853351e142973fdbf267fb0 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -36,7 +36,7 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include "inet.h"
+#include <arpa/inet.h>
 
 #include "h.h"
 #define debug 1

diff --git a/src/s_ping.c b/src/s_ping.c
index a0423cebf442f3a581bf6a2cf5be8f3b37d7c8cb..f50ac1d08309cb3e5e883fd371d2c501409ceb94 100644 (file)
--- a/src/s_ping.c
+++ b/src/s_ping.c
@@ -25,9 +25,6 @@
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
-#if defined(__hpux)
-#include "inet.h"
-#endif
 #include <fcntl.h>
 #include "sock.h"                /* If FD_ZERO isn't defined up to this point,  */
                        /* define it (BSD4.2 needs this) */