~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rearrange so as not to include Linux headers unless we need to.
[tripe]
/
tripe.h
diff --git
a/tripe.h
b/tripe.h
index
4174483
..
3c0a154
100644
(file)
--- a/
tripe.h
+++ b/
tripe.h
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: tripe.h,v 1.1
3 2003/04/06 10:26:35
mdw Exp $
+ * $Id: tripe.h,v 1.1
4 2003/04/06 10:36:33
mdw Exp $
*
* Main header file for TrIPE
*
*
* Main header file for TrIPE
*
@@
-29,6
+29,9
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: tripe.h,v $
/*----- 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.
*
* 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>
#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>
#include <pwd.h>
#include <grp.h>
@@
-388,6
+386,11
@@
enum {
* Used to maintain system-specific information about the tunnel interface.
*/
* 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 */
typedef struct tunnel {
#if TUN_TYPE == TUN_UNET
sel_file f; /* Selector for Usernet device */