summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorpooka <pooka@NetBSD.org>2009-11-05 17:16:36 +0000
committerpooka <pooka@NetBSD.org>2009-11-05 17:16:36 +0000
commit2e098f1f4ecfaef7ecbd85962efff66576fa281a (patch)
treecd02f0e5ed8761cca4952794ea4c8d7c50beb668 /sys
parent5207b24e34b5f0337c89145cb3132623bd503aaa (diff)
... actually, define compat only for the kernel. Userlandia should
see only one version of the interfaces.
Diffstat (limited to 'sys')
-rw-r--r--sys/ufs/lfs/lfs.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/ufs/lfs/lfs.h b/sys/ufs/lfs/lfs.h
index 375cce1982f..7f7420ff42b 100644
--- a/sys/ufs/lfs/lfs.h
+++ b/sys/ufs/lfs/lfs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.h,v 1.131 2009/11/05 16:59:55 pooka Exp $ */
+/* $NetBSD: lfs.h,v 1.132 2009/11/05 17:16:36 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -67,8 +67,6 @@
#include <sys/queue.h>
#include <sys/condvar.h>
-#include <compat/sys/time_types.h>
-
/*
* Compile-time options for LFS.
*/
@@ -1103,7 +1101,13 @@ struct lfs_fhandle {
# define LFS_WRAP_WAITING 0x1
#define LFCNWRAPSTATUS _FCNW_FSPRIV('L', 13, int)
-/* Compat */
+/*
+ * Compat. Defined for kernel only. Userland always uses
+ * "the one true version".
+ */
+#ifdef _KERNEL
+#include <compat/sys/time_types.h>
+
#define LFCNSEGWAITALL_COMPAT _FCNW_FSPRIV('L', 0, struct timeval50)
#define LFCNSEGWAIT_COMPAT _FCNW_FSPRIV('L', 1, struct timeval50)
#define LFCNIFILEFH_COMPAT _FCNW_FSPRIV('L', 5, struct lfs_fhandle)
@@ -1112,6 +1116,7 @@ struct lfs_fhandle {
#define LFCNWRAPGO_COMPAT _FCNO_FSPRIV('L', 10)
#define LFCNSEGWAITALL_COMPAT_50 _FCNR_FSPRIV('L', 0, struct timeval50)
#define LFCNSEGWAIT_COMPAT_50 _FCNR_FSPRIV('L', 1, struct timeval50)
+#endif
#ifdef _KERNEL
/* XXX MP */