Skip to contentSkip to conversation

tap: Remove double include of util.h

PATCH Applied Andreas Färber 2 participants 2 messages Sep 28, 2010 – Sep 29, 2010 Networking

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tap: Remove double include of util.h

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.

---
 net/tap-bsd.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
net/tap-bsd.c +0 -4
index 959939e..0c0ca5b 100644
@@ -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;
Signature · 1 line
1.7.3
Applied
#1 lore raw

Thanks, applied.

Quoted 29 lines · 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.

---
 net/tap-bsd.c |    4 ----

 1 files changed, 0 insertions(+), 4 deletions(-)
net/tap-bsd.c +0 -5
index 959939e..0c0ca5b 100644
@@ -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