External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include <sys/socket.h> before including <net/if.h>

Browse Source 
This is necessary for OS X 10.8 and earlier.

Signed-off-by: Ryan Schmidt <git@ryandesign.com>
This commit is contained in:
Ryan Schmidt 2020-07-09 00:36:33 -05:00 committed by Daniel Berrange
parent c4cd0ef917
commit a9f1ac3a97
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -395,7 +395,6 @@ AC_CHECK_HEADERS([\
linux/magic.h \ linux/magic.h \
mntent.h \ mntent.h \
net/ethernet.h \ net/ethernet.h \
net/if.h \
pty.h \ pty.h \
pwd.h \ pwd.h \
stdarg.h \ stdarg.h \
@ -407,6 +406,7 @@ AC_CHECK_HEADERS([\
sys/ucred.h \ sys/ucred.h \
xlocale.h \ xlocale.h \
]) ])
AC_CHECK_HEADERS([net/if.h], [], [], [[#include <sys/socket.h>]])
dnl Check whether endian provides handy macros. dnl Check whether endian provides handy macros.
AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]]) AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]])
AC_CHECK_FUNCS([stat stat64 __xstat __xstat64 lstat lstat64 __lxstat __lxstat64]) AC_CHECK_FUNCS([stat stat64 __xstat __xstat64 lstat lstat64 __lxstat __lxstat64])

8
src/util/virnetdev.h
View File

@ -18,10 +18,6 @@
#pragma once #pragma once
#ifdef HAVE_NET_IF_H
# include <net/if.h>
#endif
#include "virbitmap.h" #include "virbitmap.h"
#include "virsocketaddr.h" #include "virsocketaddr.h"
#include "virmacaddr.h" #include "virmacaddr.h"
@ -29,6 +25,10 @@
#include "virnetdevvlan.h" #include "virnetdevvlan.h"
#include "virenum.h" #include "virenum.h"
#ifdef HAVE_NET_IF_H
# include <net/if.h>
#endif
#ifdef HAVE_STRUCT_IFREQ #ifdef HAVE_STRUCT_IFREQ
typedef struct ifreq virIfreq; typedef struct ifreq virIfreq;
#else #else