diff options
author | Gerald Carter <jerry@samba.org> | 2002-06-17 18:36:36 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2002-06-17 18:36:36 +0000 |
commit | 1e6e5b299c235b513095a76a4cd9fffc41e8fc9c (patch) | |
tree | 9f741529073ad411cc7328334e26d3e35b1d33f1 /source/lib/interfaces.c | |
parent | a11c5d7ad07d259d764aede4745d13f8163a8212 (diff) | |
download | samba-1e6e5b299c235b513095a76a4cd9fffc41e8fc9c.tar.gz samba-1e6e5b299c235b513095a76a4cd9fffc41e8fc9c.tar.xz samba-1e6e5b299c235b513095a76a4cd9fffc41e8fc9c.zip |
beginning to sync up for 2.2.5 release....
Diffstat (limited to 'source/lib/interfaces.c')
-rw-r--r-- | source/lib/interfaces.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/lib/interfaces.c b/source/lib/interfaces.c index e7b9efa1f0a..9e8c979aa7b 100644 --- a/source/lib/interfaces.c +++ b/source/lib/interfaces.c @@ -39,15 +39,8 @@ #include <arpa/inet.h> #include <netdb.h> #include <sys/ioctl.h> -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif #include <net/if.h> -#ifndef SIOCGIFCONF -#include <sys/sockio.h> -#endif - #ifdef AUTOCONF_TEST struct iface_struct { char name[16]; @@ -59,6 +52,16 @@ struct iface_struct { #include "interfaces.h" #endif +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif + +#ifndef SIOCGIFCONF +#ifdef HAVE_SYS_SOCKIO_H +#include <sys/sockio.h> +#endif +#endif + #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif |