Module Name: src
Committed By: pgoyette
Date: Tue Mar 6 23:31:29 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: if_40.h
src/sys/net [pgoyette-compat]: if.h
Log Message:
Better to add these required headers closer to where they're needed
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/common/if_40.h
cvs rdiff -u -r1.258.2.3 -r1.258.2.4 src/sys/net/if.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/if_40.h
diff -u src/sys/compat/common/if_40.h:1.1.2.1 src/sys/compat/common/if_40.h:1.1.2.2
--- src/sys/compat/common/if_40.h:1.1.2.1 Tue Mar 6 23:17:42 2018
+++ src/sys/compat/common/if_40.h Tue Mar 6 23:31:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_40.h,v 1.1.2.1 2018/03/06 23:17:42 pgoyette Exp $ */
+/* $NetBSD: if_40.h,v 1.1.2.2 2018/03/06 23:31:29 pgoyette Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -33,6 +33,10 @@
#define _COMPAT_IF_40_H_
#if defined(COMPAT_40)
+
+#include <net/if.h>
+#include <compat/sys/sockio.h>
+
extern u_long (*vec_compat_cvtcmd)(u_long);
extern int (*vec_compat_ifioctl)(struct socket *, u_long, u_long,
void *, struct lwp *);
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.258.2.3 src/sys/net/if.h:1.258.2.4
--- src/sys/net/if.h:1.258.2.3 Tue Mar 6 23:27:52 2018
+++ src/sys/net/if.h Tue Mar 6 23:31:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.258.2.3 2018/03/06 23:27:52 pgoyette Exp $ */
+/* $NetBSD: if.h,v 1.258.2.4 2018/03/06 23:31:29 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -88,11 +88,8 @@
#include <sys/pslist.h>
#include <sys/pserialize.h>
#include <sys/psref.h>
-#include <net/if.h>
#endif
-#include <compat/sys/sockio.h>
-
/*
* Always include ALTQ glue here -- we use the ALTQ interface queue
* structure even when ALTQ is not configured into the kernel so that
