xnu-2422.115.4.tar.gz

[apple/xnu.git] / bsd / sys / _structs.h

diff --git a/bsd/sys/_structs.h b/bsd/sys/_structs.h
index e0792b73f48ea3048da81c5d45ccb8a0b9ce6ed3..99e4c3250c81d28e73f494a2223dfd9635cf13a4 100644 (file)
--- a/bsd/sys/_structs.h
+++ b/bsd/sys/_structs.h
@@ -65,99 +65,32 @@
 
 #ifdef __need_struct_sigaltstack
 #undef __need_struct_sigaltstack
 
 #ifdef __need_struct_sigaltstack
 #undef __need_struct_sigaltstack

-/* Structure used in sigaltstack call. */
-#ifndef _STRUCT_SIGALTSTACK
-#if __DARWIN_UNIX03
-#define _STRUCT_SIGALTSTACK    struct __darwin_sigaltstack
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_SIGALTSTACK    struct sigaltstack
-#endif /* __DARWIN_UNIX03 */
-_STRUCT_SIGALTSTACK
-{
-       void            *ss_sp;         /* signal stack base */
-       __darwin_size_t ss_size;        /* signal stack length */
-       int             ss_flags;       /* SA_DISABLE and/or SA_ONSTACK */
-};
-#endif /* _STRUCT_SIGALTSTACK */
+#include <sys/_types/_sigaltstack.h>

 #endif /* __need_struct_sigaltstack */
 
 #ifdef __need_struct_timespec
 #undef __need_struct_timespec
 #endif /* __need_struct_sigaltstack */
 
 #ifdef __need_struct_timespec
 #undef __need_struct_timespec

-#ifndef _STRUCT_TIMESPEC
-#define _STRUCT_TIMESPEC       struct timespec
-_STRUCT_TIMESPEC
-{
-       __darwin_time_t tv_sec;
-       long            tv_nsec;
-};
-#endif /* _STRUCT_TIMESPEC */
+#include <sys/_types/_timespec.h>

 #endif /* __need_struct_timespec */
 
 #ifdef __need_struct_timeval
 #undef __need_struct_timeval
 #endif /* __need_struct_timespec */
 
 #ifdef __need_struct_timeval
 #undef __need_struct_timeval

-#ifndef _STRUCT_TIMEVAL
-#define _STRUCT_TIMEVAL                struct timeval
-_STRUCT_TIMEVAL
-{
-       __darwin_time_t         tv_sec;         /* seconds */
-       __darwin_suseconds_t    tv_usec;        /* and microseconds */
-};
-#endif /* _STRUCT_TIMEVAL */
+#include <sys/_types/_timeval.h>

 #endif /* __need_struct_timeval */
 
 #ifdef __need_struct_timeval32
 #undef __need_struct_timeval32
 #endif /* __need_struct_timeval */
 
 #ifdef __need_struct_timeval32
 #undef __need_struct_timeval32

-#ifndef _STRUCT_TIMEVAL32
-#define _STRUCT_TIMEVAL32      struct timeval32
-_STRUCT_TIMEVAL32
-{
-       __int32_t               tv_sec;         /* seconds */
-       __int32_t               tv_usec;        /* and microseconds */
-};
-#endif /* _STRUCT_TIMEVAL32 */
+#include <sys/_types/_timeval32.h>

 #endif /* __need_struct_timeval32 */
 
 #ifdef __need_struct_ucontext
 #undef __need_struct_ucontext
 #endif /* __need_struct_timeval32 */
 
 #ifdef __need_struct_ucontext
 #undef __need_struct_ucontext

-#ifndef _STRUCT_UCONTEXT
-#if __DARWIN_UNIX03
-#define _STRUCT_UCONTEXT       struct __darwin_ucontext
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_UCONTEXT       struct ucontext
-#endif /* __DARWIN_UNIX03 */
-_STRUCT_UCONTEXT
-{
-       int                     uc_onstack;
-       __darwin_sigset_t       uc_sigmask;     /* signal mask used by this context */
-       _STRUCT_SIGALTSTACK     uc_stack;       /* stack used by this context */
-       _STRUCT_UCONTEXT        *uc_link;       /* pointer to resuming context */
-       __darwin_size_t         uc_mcsize;      /* size of the machine context passed in */
-       _STRUCT_MCONTEXT        *uc_mcontext;   /* pointer to machine specific context */
-#ifdef _XOPEN_SOURCE
-       _STRUCT_MCONTEXT        __mcontext_data;
-#endif /* _XOPEN_SOURCE */
-};
-#endif /* _STRUCT_UCONTEXT */
+#include <sys/_types/_ucontext.h>

 #endif /* __need_struct_ucontext */
 
 #ifdef __need_struct_ucontext64
 #undef __need_struct_ucontext64
 #endif /* __need_struct_ucontext */
 
 #ifdef __need_struct_ucontext64
 #undef __need_struct_ucontext64

-#ifndef _STRUCT_UCONTEXT64
-#if __DARWIN_UNIX03
-#define _STRUCT_UCONTEXT64     struct __darwin_ucontext64
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_UCONTEXT64     struct ucontext64
-#endif /* __DARWIN_UNIX03 */
-_STRUCT_UCONTEXT64
-{
-       int                     uc_onstack;
-       __darwin_sigset_t       uc_sigmask;     /* signal mask used by this context */
-       _STRUCT_SIGALTSTACK     uc_stack;       /* stack used by this context */
-       _STRUCT_UCONTEXT64      *uc_link;       /* pointer to resuming context */
-       __darwin_size_t         uc_mcsize;      /* size of the machine context passed in */
-       _STRUCT_MCONTEXT64      *uc_mcontext64; /* pointer to machine specific context */
-};
-#endif /* _STRUCT_UCONTEXT64 */
+#include <sys/_types/_ucontext64.h>

 #endif /* __need_struct_ucontext64 */
 
 #ifdef KERNEL
 #endif /* __need_struct_ucontext64 */
 
 #ifdef KERNEL


@@ -167,88 +100,59 @@ _STRUCT_UCONTEXT64
  */
 #ifdef __need_struct_user_timespec
 #undef __need_struct_user_timespec
  */
 #ifdef __need_struct_user_timespec
 #undef __need_struct_user_timespec

-#ifndef _STRUCT_USER_TIMESPEC
-#define _STRUCT_USER_TIMESPEC  struct user_timespec
-_STRUCT_USER_TIMESPEC
-{
-       user_time_t     tv_sec;         /* seconds */
-       __int64_t       tv_nsec __attribute((aligned(8)));      /* and nanoseconds */
-};
-#endif /* _STRUCT_USER_TIMESPEC */
+#include <sys/_types/_user_timespec.h>

 #endif /* __need_struct_user_timespec */
 #endif /* __need_struct_user_timespec */

+
+#ifdef __need_struct_user64_timespec
+#undef __need_struct_user64_timespec
+#include <sys/_types/_user64_timespec.h>
+#endif /* __need_struct_user64_timespec */
+
+#ifdef __need_struct_user32_timespec
+#undef __need_struct_user32_timespec
+#include <sys/_types/_user32_timespec.h>
+#endif /* __need_struct_user32_timespec */
+
+#ifdef __need_struct_user_timeval
+#undef __need_struct_user_timeval
+#include <sys/_types/_user_timeval.h>
+#endif /* __need_struct_user_timeval */
+
+#ifdef __need_struct_user64_timeval
+#undef __need_struct_user64_timeval
+#include <sys/_types/_user64_timeval.h>
+#endif /* __need_struct_user64_timeval */
+
+#ifdef __need_struct_user32_timeval
+#undef __need_struct_user32_timeval
+#include <sys/_types/_user32_timeval.h>
+#endif /* __need_struct_user32_timeval */
+
+#ifdef __need_struct_user64_itimerval
+#undef __need_struct_user64_itimerval
+#include <sys/_types/_user64_itimerval.h>
+#endif /* __need_struct_user64_itimerval */
+
+#ifdef __need_struct_user32_itimerval
+#undef __need_struct_user32_itimerval
+#include <sys/_types/_user32_itimerval.h>
+#endif /* __need_struct_user32_itimerval */
+

 #endif /* KERNEL */
 
 #ifdef __need_fd_set
 #undef __need_fd_set
 #endif /* KERNEL */
 
 #ifdef __need_fd_set
 #undef __need_fd_set

-#ifndef _FD_SET
-#define _FD_SET
-/*
- * Select uses bit masks of file descriptors in longs.  These macros
- * manipulate such bit fields (the filesystem macros use chars).  The
- * extra protection here is to permit application redefinition above
- * the default size.
- */
-#ifdef FD_SETSIZE
-#define        __DARWIN_FD_SETSIZE     FD_SETSIZE
-#else /* !FD_SETSIZE */
-#define        __DARWIN_FD_SETSIZE     1024
-#endif /* FD_SETSIZE */
-#define        __DARWIN_NBBY           8                               /* bits in a byte */
-#define __DARWIN_NFDBITS       (sizeof(__int32_t) * __DARWIN_NBBY) /* bits per mask */
-#define        __DARWIN_howmany(x, y) (((x) + ((y) - 1)) / (y))        /* # y's == x bits? */
-
-__BEGIN_DECLS
-typedef        struct fd_set {
-       __int32_t       fds_bits[__DARWIN_howmany(__DARWIN_FD_SETSIZE, __DARWIN_NFDBITS)];
-} fd_set;
-__END_DECLS
-
-/* This inline avoids argument side-effect issues with FD_ISSET() */
-static __inline int
-__darwin_fd_isset(int _n, struct fd_set *_p)
-{
-       return (_p->fds_bits[_n/__DARWIN_NFDBITS] & (1<<(_n % __DARWIN_NFDBITS)));
-}
-
-#define        __DARWIN_FD_SET(n, p)   do { int __fd = (n); ((p)->fds_bits[__fd/__DARWIN_NFDBITS] |= (1<<(__fd % __DARWIN_NFDBITS))); } while(0)
-#define        __DARWIN_FD_CLR(n, p)   do { int __fd = (n); ((p)->fds_bits[__fd/__DARWIN_NFDBITS] &= ~(1<<(__fd % __DARWIN_NFDBITS))); } while(0)
-#define        __DARWIN_FD_ISSET(n, p) __darwin_fd_isset((n), (p))
-
-#if __GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ >= 3
-/*
- * Use the built-in bzero function instead of the library version so that
- * we do not pollute the namespace or introduce prototype warnings.
- */
-#define        __DARWIN_FD_ZERO(p)     __builtin_bzero(p, sizeof(*(p)))
-#else
-#define        __DARWIN_FD_ZERO(p)     bzero(p, sizeof(*(p)))
-#endif
-
-#define        __DARWIN_FD_COPY(f, t)  bcopy(f, t, sizeof(*(f)))
-#endif /* _FD_SET */
+#include <sys/_types/_fd_def.h>

 #endif /* __need_fd_set */
 
 #ifdef __need_stack_t
 #undef __need_stack_t
 #endif /* __need_fd_set */
 
 #ifdef __need_stack_t
 #undef __need_stack_t

-#ifndef _STACK_T
-#define _STACK_T
-typedef _STRUCT_SIGALTSTACK    stack_t; /* [???] signal stack */
-#endif /* _STACK_T */

 #endif /* __need_stack_t */
 
 #ifdef __need_ucontext_t
 #undef __need_ucontext_t
 #endif /* __need_stack_t */
 
 #ifdef __need_ucontext_t
 #undef __need_ucontext_t

-/* user context */
-#ifndef _UCONTEXT_T
-#define _UCONTEXT_T
-typedef _STRUCT_UCONTEXT       ucontext_t;     /* [???] user context */
-#endif /* _UCONTEXT_T */

 #endif /* __need_ucontext_t */
 
 #ifdef __need_ucontext64_t
 #undef __need_ucontext64_t
 #endif /* __need_ucontext_t */
 
 #ifdef __need_ucontext64_t
 #undef __need_ucontext64_t

-#ifndef _UCONTEXT64_T
-#define _UCONTEXT64_T
-typedef _STRUCT_UCONTEXT64     ucontext64_t;   /* [???] user context */
-#endif /* _UCONTEXT64_T */

 #endif /* __need_ucontext64_t */
 #endif /* __need_ucontext64_t */