1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
$NetBSD: patch-ab,v 1.31 2004/11/28 22:39:07 atatat Exp $
Incorporate a patch from the author that widens the NETBSDV definition
to account for new current versioning system, properly handles the
sys/bufq.h mess, adds a bit more to procfs support, and adds ptyfs
support.
--- dialects/n+obsd/dlsof.h.orig 2004-03-10 18:51:36.000000000 -0500
+++ dialects/n+obsd/dlsof.h
@@ -98,9 +98,9 @@ struct uio; /* dummy for function protot
#include <rpc/types.h>
#include <sys/protosw.h>
-# if defined(NETBSDV) && NETBSDV>=1030
+# if defined(NETBSDV) && NETBSDV>=1003000
#define sockproto NETBSD_sockproto
-# endif /* defined(NETBSDV) && NETBSDV>=1030 */
+# endif /* defined(NETBSDV) && NETBSDV>=1003000 */
#include <sys/socket.h>
@@ -145,9 +145,9 @@ struct nameidata; /* to satisfy a functi
#include <msdosfs/denode.h>
# endif /* defined(HASMSDOSFS) */
-# if defined(NETBSDV) && NETBSDV>=1030
+# if defined(NETBSDV) && NETBSDV>=1003000
#undef sockproto
-# endif /* defined(NETBSDV) && NETBSDV>=1030 */
+# endif /* defined(NETBSDV) && NETBSDV>=1003000 */
#include <sys/socketvar.h>
#include <sys/un.h>
@@ -202,7 +202,7 @@ struct nameidata; /* to satisfy a functi
#include <sys/vnode.h>
-# if defined(NETBSDV) && NETBSDV>=1030
+# if defined(NETBSDV) && NETBSDV>=1003000
/*
* Because late in the 1.3I NetBSD development cycle the sockproto structure
* was placed under _KERNEL in <sys/socket.h>, and because defining _KERNEL
@@ -217,7 +217,7 @@ struct sockproto {
u_short sp_family;
u_short sp_protocol;
};
-# endif /* defined(NETBSDV) && NETBSDV>=1030 */
+# endif /* defined(NETBSDV) && NETBSDV>=1003000 */
#include <net/raw_cb.h>
#include <sys/domain.h>
@@ -245,6 +245,14 @@ struct sockproto {
#undef DIRENT_DIRBLKSIZ
# endif /*defined(DIRENT_BLKSIZ) */
+# if defined(HASBUFQ_H)
+# if defined(NETBSDV) && NETBSDV>=2099010
+#define _KERNEL
+#include <sys/bufq.h>
+#undef _KERNEL
+# endif /* defined(NETBSDV) && NETBSDV>=2099010 */
+#endif /* defined(HASBUFQ_H) */
+
#undef KERNEL
#include <ufs/mfs/mfsnode.h>
@@ -331,9 +339,9 @@ struct sockproto {
# if defined(HASNULLFS)
#define _KERNEL
-# if defined(NETBSDV) && NETBSDV>=1050 && __NetBSD_Version__<106060000
+# if defined(NETBSDV) && NETBSDV>=1005000 && __NetBSD_Version__<106060000
#include "netexport.h"
-# endif /* defined(NETBSDV) && NETBSDV>=1050
+# endif /* defined(NETBSDV) && NETBSDV>=1005000
&& __NetBSD_Version__<106060000 */
#include <miscfs/nullfs/null.h>
#undef _KERNEL
@@ -357,10 +365,20 @@ struct sockproto {
#define Pstatus PFSstatus
#define Pnote PFSnote
#define Pnotepg PFSnotepg
+#define Pfd PFSfd
+#define Pmap PFSmap
+#define Pmaps PFSmaps
# endif /* defined(HASPROCFS_PFSROOT) */
#include <machine/reg.h>
# endif /* defined(HASPROCFS) */
+# if defined(HASPTYFS)
+#define _KERNEL
+#include <fs/ptyfs/ptyfs.h>
+#include <miscfs/specfs/specdev.h>
+#undef _KERNEL
+# endif /* defined(HASPTYFS) */
+
#define KERNEL
#define _KERNEL
#include <sys/file.h>
@@ -515,9 +533,9 @@ struct sfile {
*/
# if defined(HASNCACHE)
-# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020)
+# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000)
#include <stddef.h>
-#endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */
+#endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */
#include <sys/uio.h>
#include <sys/namei.h>
@@ -527,15 +545,15 @@ struct sfile {
#define NCACHE_NODEADDR nc_vp /* node address in NCACHE */
#define NCACHE_PARADDR nc_dvp /* parent node address in NCACHE */
-# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020)
+# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000)
#define NCACHE_NXT nc_hash.le_next /* link in NCACHE */
-# else /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */
+# else /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */
# if defined(NetBSD1_0) && NetBSD<1994101
#define NCACHE_NXT nc_nxt /* link in NCACHE */
# else /* !defined(NetBSD1_0) || NetBSD>=1994101 */
#define NCACHE_NXT nc_lru.tqe_next /* link in NCACHE */
# endif /* defined(NetBSD1_0) && NetBSD<1994101 */
-# endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */
+# endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */
# if defined(HASNCVPID)
#define NCACHE_PARID nc_dvpid /* parent node ID in NCACHE */
|
