summaryrefslogtreecommitdiffstats
path: root/cpukit/libnetworking/sys
diff options
context:
space:
mode:
Diffstat (limited to 'cpukit/libnetworking/sys')
-rw-r--r--cpukit/libnetworking/sys/buf.h4
-rw-r--r--cpukit/libnetworking/sys/callout.h2
-rw-r--r--cpukit/libnetworking/sys/conf.h10
-rw-r--r--cpukit/libnetworking/sys/domain.h2
-rw-r--r--cpukit/libnetworking/sys/malloc.h4
-rw-r--r--cpukit/libnetworking/sys/mbuf.h2
-rw-r--r--cpukit/libnetworking/sys/mount.h16
-rw-r--r--cpukit/libnetworking/sys/protosw.h6
-rw-r--r--cpukit/libnetworking/sys/queue.h2
-rw-r--r--cpukit/libnetworking/sys/rtprio.h4
-rw-r--r--cpukit/libnetworking/sys/select.h2
-rw-r--r--cpukit/libnetworking/sys/signalvar.h4
-rw-r--r--cpukit/libnetworking/sys/socket.h6
-rw-r--r--cpukit/libnetworking/sys/socketvar.h4
-rw-r--r--cpukit/libnetworking/sys/sysctl.h10
-rw-r--r--cpukit/libnetworking/sys/syslog.h8
-rw-r--r--cpukit/libnetworking/sys/ucred.h4
-rw-r--r--cpukit/libnetworking/sys/uio.h10
18 files changed, 50 insertions, 50 deletions
diff --git a/cpukit/libnetworking/sys/buf.h b/cpukit/libnetworking/sys/buf.h
index 6cca571141..109a7d2b39 100644
--- a/cpukit/libnetworking/sys/buf.h
+++ b/cpukit/libnetworking/sys/buf.h
@@ -186,7 +186,7 @@ extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
#define B_CLRBUF 0x01 /* Request allocated buffer be cleared. */
#define B_SYNC 0x02 /* Do all allocations synchronously. */
-#ifdef KERNEL
+#ifdef _KERNEL
extern int nbuf; /* The number of buffer headers */
extern struct buf *buf; /* The buffer headers. */
extern char *buffers; /* The buffer contents. */
@@ -243,6 +243,6 @@ void vm_bounce_alloc __P((struct buf *));
void vm_bounce_free __P((struct buf *));
vm_offset_t vm_bounce_kva_alloc __P((int));
void vm_bounce_kva_alloc_free __P((vm_offset_t, int));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_SYS_BUF_H_ */
diff --git a/cpukit/libnetworking/sys/callout.h b/cpukit/libnetworking/sys/callout.h
index 5fec98f28b..1e682b09c9 100644
--- a/cpukit/libnetworking/sys/callout.h
+++ b/cpukit/libnetworking/sys/callout.h
@@ -49,7 +49,7 @@ struct callout {
int c_time; /* ticks to the event */
};
-#ifdef KERNEL
+#ifdef _KERNEL
extern struct callout *callfree, *callout, calltodo;
extern int ncallout;
#endif
diff --git a/cpukit/libnetworking/sys/conf.h b/cpukit/libnetworking/sys/conf.h
index 92d99d9d07..207acfe33d 100644
--- a/cpukit/libnetworking/sys/conf.h
+++ b/cpukit/libnetworking/sys/conf.h
@@ -94,7 +94,7 @@ struct bdevsw {
int d_maj; /* the major number we were assigned */
};
-#ifdef KERNEL
+#ifdef _KERNEL
extern struct bdevsw *bdevsw[];
#endif
@@ -118,7 +118,7 @@ struct cdevsw {
int d_maj;
};
-#ifdef KERNEL
+#ifdef _KERNEL
extern struct cdevsw *cdevsw[];
#endif
@@ -136,7 +136,7 @@ struct linesw {
l_modem_t *l_modem;
};
-#ifdef KERNEL
+#ifdef _KERNEL
extern struct linesw linesw[];
extern int nlinesw;
@@ -158,7 +158,7 @@ struct swdevt {
#define SW_SEQUENTIAL 0x02
#define sw_freed sw_flags /* XXX compat */
-#ifdef KERNEL
+#ifdef _KERNEL
d_open_t noopen;
d_close_t noclose;
d_read_t noread;
@@ -221,7 +221,7 @@ int isdisk __P((dev_t dev, int type));
int iskmemdev __P((dev_t dev));
int iszerodev __P((dev_t dev));
void setconf __P((void));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#include <machine/conf.h>
diff --git a/cpukit/libnetworking/sys/domain.h b/cpukit/libnetworking/sys/domain.h
index 2ec8a5fb05..54622018b2 100644
--- a/cpukit/libnetworking/sys/domain.h
+++ b/cpukit/libnetworking/sys/domain.h
@@ -63,7 +63,7 @@ struct domain {
int dom_maxrtkey; /* for routing layer */
};
-#ifdef KERNEL
+#ifdef _KERNEL
extern struct domain *domains;
extern struct domain localdomain;
diff --git a/cpukit/libnetworking/sys/malloc.h b/cpukit/libnetworking/sys/malloc.h
index ec85c1814d..4574213ee8 100644
--- a/cpukit/libnetworking/sys/malloc.h
+++ b/cpukit/libnetworking/sys/malloc.h
@@ -258,7 +258,7 @@ struct kmembuckets {
long kb_couldfree; /* over high water mark and could free */
};
-#ifdef KERNEL
+#ifdef _KERNEL
#define MINALLOCSIZE (1 << MINBUCKET)
#define BUCKETINDX(size) \
((size) <= (MINALLOCSIZE * 128) \
@@ -350,6 +350,6 @@ void *contigmalloc __P((unsigned long size, int type, int flags,
unsigned long alignment, unsigned long boundary));
void free __P((void *addr, int type));
void *malloc __P((unsigned long size, int type, int flags));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_SYS_MALLOC_H_ */
diff --git a/cpukit/libnetworking/sys/mbuf.h b/cpukit/libnetworking/sys/mbuf.h
index 5bc97c742b..30c7d06be3 100644
--- a/cpukit/libnetworking/sys/mbuf.h
+++ b/cpukit/libnetworking/sys/mbuf.h
@@ -376,7 +376,7 @@ struct mbstat {
u_short m_mtypes[256]; /* type specific mbuf allocations */
};
-#ifdef KERNEL
+#ifdef _KERNEL
extern struct mbuf *mbutl; /* virtual address of mclusters */
extern char *mclrefcnt; /* cluster reference counts */
extern struct mbstat mbstat;
diff --git a/cpukit/libnetworking/sys/mount.h b/cpukit/libnetworking/sys/mount.h
index a6254e302d..e3f6d04f9d 100644
--- a/cpukit/libnetworking/sys/mount.h
+++ b/cpukit/libnetworking/sys/mount.h
@@ -37,7 +37,7 @@
#ifndef _SYS_MOUNT_H_
#define _SYS_MOUNT_H_
-#ifndef KERNEL
+#ifndef _KERNEL
#include <sys/ucred.h>
#endif
#include <sys/queue.h>
@@ -233,7 +233,7 @@ struct vfsconf {
/*
* Operations supported on mounted file system.
*/
-#ifdef KERNEL
+#ifdef _KERNEL
extern int doforce; /* Flag to permit forcible unmounting. */
extern struct vfsconf void_vfsconf;
@@ -312,7 +312,7 @@ struct vfsops {
DATA_SET(vfs_set,_fs_vfsconf)
#endif /* VFS_LKM */
-#endif /* KERNEL */
+#endif /* _KERNEL */
/*
* Flags for various system call interfaces.
@@ -331,7 +331,7 @@ struct fhandle {
};
typedef struct fhandle fhandle_t;
-#ifdef KERNEL
+#ifdef _KERNEL
#include <net/radix.h>
#include <sys/socket.h> /* XXX for AF_MAX */
@@ -351,7 +351,7 @@ struct netexport {
struct netcred ne_defexported; /* Default export */
struct radix_node_head *ne_rtable[AF_MAX+1]; /* Individual exports */
};
-#endif /* KERNEL */
+#endif /* _KERNEL */
/*
* Export arguments for local filesystem mount calls.
@@ -477,7 +477,7 @@ struct nfs_args {
#define NFSMNT_AUTHERR 0x80000000 /* Authentication error */
#endif /* NFS */
-#ifdef KERNEL
+#ifdef _KERNEL
extern int (*mountroot) __P((void *));
extern struct vfsops *mountrootvfsops;
@@ -503,7 +503,7 @@ void vfs_unbusy __P((struct mount *)); /* mark a vfs not busy */
extern CIRCLEQ_HEAD(mntlist, mount) mountlist; /* mounted filesystem list */
extern struct vfsops *vfssw[]; /* filesystem type table */
-#else /* KERNEL */
+#else /* _KERNEL */
#include <sys/cdefs.h>
@@ -526,6 +526,6 @@ int vfsisloadable __P((const char *));
int vfsload __P((const char *));
__END_DECLS
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_SYS_MOUNT_H_ */
diff --git a/cpukit/libnetworking/sys/protosw.h b/cpukit/libnetworking/sys/protosw.h
index a7aa52feea..c6aa71c22c 100644
--- a/cpukit/libnetworking/sys/protosw.h
+++ b/cpukit/libnetworking/sys/protosw.h
@@ -166,7 +166,7 @@ char *prurequests[] = {
};
#endif
-#ifdef KERNEL /* users shouldn't see this decl */
+#ifdef _KERNEL /* users shouldn't see this decl */
struct stat;
struct ifnet;
@@ -223,7 +223,7 @@ int pru_sense_null __P((struct socket *so, struct stat *sb));
extern struct pr_usrreqs pru_oldstyle;
#endif /* PRU_OLDSTYLE */
-#endif /* KERNEL */
+#endif /* _KERNEL */
/*
* The arguments to the ctlinput routine are
@@ -292,7 +292,7 @@ char *prcorequests[] = {
};
#endif
-#ifdef KERNEL
+#ifdef _KERNEL
struct protosw *pffindproto __P((int family, int protocol, int type));
struct protosw *pffindtype __P((int family, int type));
#endif
diff --git a/cpukit/libnetworking/sys/queue.h b/cpukit/libnetworking/sys/queue.h
index db0f2dd804..6ff47d9fe2 100644
--- a/cpukit/libnetworking/sys/queue.h
+++ b/cpukit/libnetworking/sys/queue.h
@@ -557,7 +557,7 @@ struct { \
(elm)->field.cqe_next; \
}
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* XXX insque() and remque() are an old way of handling certain queues.
diff --git a/cpukit/libnetworking/sys/rtprio.h b/cpukit/libnetworking/sys/rtprio.h
index dd9521e7c8..843cf8cd1f 100644
--- a/cpukit/libnetworking/sys/rtprio.h
+++ b/cpukit/libnetworking/sys/rtprio.h
@@ -60,11 +60,11 @@ struct rtprio {
};
#endif
-#ifndef KERNEL
+#ifndef _KERNEL
#include <sys/cdefs.h>
__BEGIN_DECLS
int rtprio __P((int, pid_t, struct rtprio *));
__END_DECLS
-#endif /* !KERNEL */
+#endif /* !_KERNEL */
#endif /* !_SYS_RTPRIO_H_ */
diff --git a/cpukit/libnetworking/sys/select.h b/cpukit/libnetworking/sys/select.h
index 2f75a3c19d..c03a1abe2c 100644
--- a/cpukit/libnetworking/sys/select.h
+++ b/cpukit/libnetworking/sys/select.h
@@ -51,7 +51,7 @@ struct selinfo {
};
#define SI_COLL 0x0001 /* collision occurred */
-#ifdef KERNEL
+#ifdef _KERNEL
struct proc;
void selrecord __P((struct proc *selector, struct selinfo *));
diff --git a/cpukit/libnetworking/sys/signalvar.h b/cpukit/libnetworking/sys/signalvar.h
index 8900458fdb..151f2c6d8e 100644
--- a/cpukit/libnetworking/sys/signalvar.h
+++ b/cpukit/libnetworking/sys/signalvar.h
@@ -147,7 +147,7 @@ static int sigprop[NSIG + 1] = {
#define sigcantmask (sigmask(SIGKILL) | sigmask(SIGSTOP))
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* Machine-independent functions:
*/
@@ -167,5 +167,5 @@ void trapsignal __P((struct proc *p, int sig, u_long code));
* Machine-dependent functions:
*/
void sendsig __P((sig_t action, int sig, int returnmask, u_long code));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_SYS_SIGNALVAR_H_ */
diff --git a/cpukit/libnetworking/sys/socket.h b/cpukit/libnetworking/sys/socket.h
index 6442581db6..544bdac10f 100644
--- a/cpukit/libnetworking/sys/socket.h
+++ b/cpukit/libnetworking/sys/socket.h
@@ -342,7 +342,7 @@ struct omsghdr {
int msg_accrightslen;
};
-#ifndef KERNEL
+#ifndef _KERNEL
__BEGIN_DECLS
int accept __P((int, struct sockaddr *, int *));
@@ -365,7 +365,7 @@ int socket __P((int, int, int));
int socketpair __P((int, int, int, int *));
__END_DECLS
-#else /* KERNEL */
+#else /* _KERNEL */
void pfctlinput __P((int, struct sockaddr *));
-#endif /* !KERNEL */
+#endif /* !_KERNEL */
#endif /* !_SYS_SOCKET_H_ */
diff --git a/cpukit/libnetworking/sys/socketvar.h b/cpukit/libnetworking/sys/socketvar.h
index 5690defb43..ec962c34b2 100644
--- a/cpukit/libnetworking/sys/socketvar.h
+++ b/cpukit/libnetworking/sys/socketvar.h
@@ -200,7 +200,7 @@ struct socket {
#define sowwakeup(so) sowakeup((so), &(so)->so_snd)
-#ifdef KERNEL
+#ifdef _KERNEL
extern u_long sb_max;
/* to catch callers missing new second argument to sonewconn: */
@@ -276,6 +276,6 @@ int sosetopt __P((struct socket *so, int level, int optname,
struct mbuf *m0));
int soshutdown __P((struct socket *so, int how));
void sowakeup __P((struct socket *so, struct sockbuf *sb));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_SYS_SOCKETVAR_H_ */
diff --git a/cpukit/libnetworking/sys/sysctl.h b/cpukit/libnetworking/sys/sysctl.h
index 7cb192f209..3c7c89792a 100644
--- a/cpukit/libnetworking/sys/sysctl.h
+++ b/cpukit/libnetworking/sys/sysctl.h
@@ -102,7 +102,7 @@ struct ctlname {
*/
#define CTL_AUTO_START 0x100
-#ifdef KERNEL
+#ifdef _KERNEL
#define SYSCTL_HANDLER_ARGS struct sysctl_oid *oidp, void *arg1, int arg2, \
struct sysctl_req *req
@@ -277,7 +277,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
sysctl_add_oid(ctx, parent, nbr, name, (access), \
ptr, arg, handler, fmt, descr)
-#endif /* KERNEL */
+#endif /* _KERNEL */
/*
* Top-level identifiers
@@ -551,7 +551,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
{ "timer_max", CTLTYPE_INT }, \
}
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* Declare some common oids.
@@ -602,7 +602,7 @@ int sysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid,
int *nindx, struct sysctl_req *req);
void sysctl_wire_old_buffer(struct sysctl_req *req, size_t len);
-#else /* !KERNEL */
+#else /* !_KERNEL */
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -610,6 +610,6 @@ int sysctl(int *, u_int, void *, size_t *, void *, size_t);
int sysctlbyname(const char *, void *, size_t *, void *, size_t);
int sysctlnametomib(const char *, int *, size_t *);
__END_DECLS
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_SYS_SYSCTL_H_ */
diff --git a/cpukit/libnetworking/sys/syslog.h b/cpukit/libnetworking/sys/syslog.h
index 08a59fa7cc..f8820f42b3 100644
--- a/cpukit/libnetworking/sys/syslog.h
+++ b/cpukit/libnetworking/sys/syslog.h
@@ -151,7 +151,7 @@ CODE facilitynames[] = {
};
#endif
-#ifdef KERNEL
+#ifdef _KERNEL
#define LOG_PRINTF -1 /* pseudo-priority to indicate use of printf */
#endif
@@ -175,9 +175,9 @@ CODE facilitynames[] = {
#define LOG_PERROR 0x20 /* log to stderr as well */
/*
-#ifdef KERNEL
+#ifdef _KERNEL
-#else not KERNEL */
+#else not _KERNEL */
#include <sys/cdefs.h>
#include <stdarg.h>
@@ -190,6 +190,6 @@ void syslog __P((int, const char *, ...));
void vsyslog __P((int, const char *, va_list));
__END_DECLS
-/* #endif !KERNEL */
+/* #endif !_KERNEL */
#endif
diff --git a/cpukit/libnetworking/sys/ucred.h b/cpukit/libnetworking/sys/ucred.h
index d3899c3b4c..5da8b344d0 100644
--- a/cpukit/libnetworking/sys/ucred.h
+++ b/cpukit/libnetworking/sys/ucred.h
@@ -50,7 +50,7 @@ struct ucred {
#define NOCRED ((struct ucred *)0) /* no credential available */
#define FSCRED ((struct ucred *)-1) /* filesystem credential */
-#ifdef KERNEL
+#ifdef _KERNEL
#define crhold(cr) (cr)->cr_ref++
struct ucred *crcopy __P((struct ucred *cr));
@@ -59,6 +59,6 @@ void crfree __P((struct ucred *cr));
struct ucred *crget __P((void));
int suser __P((struct ucred *cred, u_short *acflag));
int groupmember __P((gid_t gid, struct ucred *cred));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_SYS_UCRED_H_ */
diff --git a/cpukit/libnetworking/sys/uio.h b/cpukit/libnetworking/sys/uio.h
index 305941500d..693bde1d82 100644
--- a/cpukit/libnetworking/sys/uio.h
+++ b/cpukit/libnetworking/sys/uio.h
@@ -56,7 +56,7 @@ enum uio_seg {
UIO_NOCOPY /* don't copy, already in object */
};
-#ifdef KERNEL
+#ifdef _KERNEL
struct uio {
struct iovec *uio_iov;
int uio_iovcnt;
@@ -72,13 +72,13 @@ struct uio {
*/
#define UIO_MAXIOV 1024 /* max 1K of iov's */
#define UIO_SMALLIOV 8 /* 8 on stack, else malloc */
-#endif /* KERNEL */
+#endif /* _KERNEL */
-#ifdef KERNEL
+#ifdef _KERNEL
int uiomove __P((caddr_t, int, struct uio *));
-#else /* !KERNEL */
+#else /* !_KERNEL */
#include <sys/cdefs.h>
@@ -87,6 +87,6 @@ ssize_t readv __P((int, const struct iovec *, int));
ssize_t writev __P((int, const struct iovec *, int));
__END_DECLS
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_SYS_UIO_H_ */