From 110d564e1b2a4d97b99cc34e1481fa6279ad9695 Mon Sep 17 00:00:00 2001
Message-Id: <110d564e1b2a4d97b99cc34e1481fa6279ad9695.1715014004.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 6 Apr 2003 10:36:33 +0000
Subject: [PATCH] Rearrange so as not to include Linux headers unless we need
 to.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 tripe.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tripe.h b/tripe.h
index 41744837..3c0a1541 100644
--- a/tripe.h
+++ b/tripe.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: tripe.h,v 1.13 2003/04/06 10:26:35 mdw Exp $
+ * $Id: tripe.h,v 1.14 2003/04/06 10:36:33 mdw Exp $
  *
  * Main header file for TrIPE
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: tripe.h,v $
+ * Revision 1.14  2003/04/06 10:36:33  mdw
+ * Rearrange so as not to include Linux headers unless we need to.
+ *
  * Revision 1.13  2003/04/06 10:26:35  mdw
  * Report peer name on decrypt errors.
  *
@@ -107,11 +110,6 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#if TUN_TYPE == TUN_LINUX
-#  include <linux/if.h>
-#  include <linux/if_tun.h>
-#endif
-
 #include <pwd.h>
 #include <grp.h>
 
@@ -388,6 +386,11 @@ enum {
  * Used to maintain system-specific information about the tunnel interface.
  */
 
+#if TUN_TYPE == TUN_LINUX
+#  include <linux/if.h>
+#  include <linux/if_tun.h>
+#endif
+
 typedef struct tunnel {
 #if TUN_TYPE == TUN_UNET 
   sel_file f;				/* Selector for Usernet device */
-- 
[mdw]