* [Qemu-devel] [PATCH] tap: Remove double include of util.h
@ 2010-09-28 21:48 Andreas Färber
2010-09-29 16:16 ` [Qemu-devel] " Blue Swirl
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Färber @ 2010-09-28 21:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Blue Swirl, Andreas Färber
If neither of __FreeBSD__, __FreeBSD_kernel__ and __DragonFly__ is defined,
util.h is included from tap-bsd.c.
Don't include it again if __OpenBSD__ is defined.
Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
---
net/tap-bsd.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 959939e..0c0ca5b 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -37,10 +37,6 @@
#include <util.h>
#endif
-#if defined(__OpenBSD__)
-#include <util.h>
-#endif
-
int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
{
int fd;
--
1.7.3
^ permalink raw reply related [flat|nested] 2+ messages in thread* [Qemu-devel] Re: [PATCH] tap: Remove double include of util.h
2010-09-28 21:48 [Qemu-devel] [PATCH] tap: Remove double include of util.h Andreas Färber
@ 2010-09-29 16:16 ` Blue Swirl
0 siblings, 0 replies; 2+ messages in thread
From: Blue Swirl @ 2010-09-29 16:16 UTC (permalink / raw)
To: Andreas Färber; +Cc: qemu-devel
Thanks, applied.
On Tue, Sep 28, 2010 at 9:48 PM, Andreas Färber <andreas.faerber@web.de> wrote:
> If neither of __FreeBSD__, __FreeBSD_kernel__ and __DragonFly__ is defined,
> util.h is included from tap-bsd.c.
> Don't include it again if __OpenBSD__ is defined.
>
> Cc: Blue Swirl <blauwirbel@gmail.com>
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
> ---
> net/tap-bsd.c | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/net/tap-bsd.c b/net/tap-bsd.c
> index 959939e..0c0ca5b 100644
> --- a/net/tap-bsd.c
> +++ b/net/tap-bsd.c
> @@ -37,10 +37,6 @@
> #include <util.h>
> #endif
>
> -#if defined(__OpenBSD__)
> -#include <util.h>
> -#endif
> -
> int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
> {
> int fd;
> --
> 1.7.3
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-29 16:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-28 21:48 [Qemu-devel] [PATCH] tap: Remove double include of util.h Andreas Färber
2010-09-29 16:16 ` [Qemu-devel] " Blue Swirl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).