sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

merge from 2.2

Browse Source
This commit is contained in:
Gerald Carter -
parent df78e76e0b
commit ce2ddb7041
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/lib/interfaces.c
View File

@ -41,10 +41,6 @@
#include <sys/time.h>
#include <net/if.h>
#ifndef SIOCGIFCONF
#include <sys/sockio.h>
#endif
#ifdef AUTOCONF_TEST
struct iface_struct {
char name[16];
@ -56,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