xnu-792.13.8.tar.gz

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

diff --git a/bsd/sys/signal.h b/bsd/sys/signal.h
index 2d165c450f40b5e7acd8f7d34b348805831ea2a8..7d103a54049e183a98073658120dd0dc6cb79959 100644 (file)
--- a/bsd/sys/signal.h
+++ b/bsd/sys/signal.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
- * 
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
  * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code 
@@ -212,10 +212,6 @@ struct sigevent {
 // LP64todo - should this move?
 #ifdef BSD_KERNEL_PRIVATE
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
 union user_sigval {
        struct {
                int             pad;    /* assumes Motorolla byte order */
@@ -232,10 +228,6 @@ struct user_sigevent {
        user_addr_t     sigev_notify_attributes;        /* Notify attributes */
 };
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-
 #endif /* BSD_KERNEL_PRIVATE */
 
 typedef struct __siginfo {
@@ -253,10 +245,6 @@ typedef struct __siginfo {
 
 #ifdef BSD_KERNEL_PRIVATE
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
 typedef struct __user_siginfo {
        int             si_signo;       /* signal number */
        int             si_errno;       /* errno association */
@@ -270,10 +258,6 @@ typedef struct __user_siginfo {
        user_ulong_t    pad[7];         /* Reserved for Future Use */
 } user_siginfo_t;
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-
 #endif /* BSD_KERNEL_PRIVATE */
 
 /* 
@@ -379,10 +363,6 @@ struct     sigaction {
 #ifdef BSD_KERNEL_PRIVATE
 #include <machine/types.h>
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
 union __user_sigaction_u {
        user_addr_t     __sa_handler;
        user_addr_t     __sa_sigaction;
@@ -401,10 +381,6 @@ struct     __user_sigaction {
        int     sa_flags;               /* see signal options below */
 };
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-
 #undef SIG_DFL
 #undef SIG_IGN
 #undef SIG_ERR
@@ -456,20 +432,12 @@ typedef   void (*sig_t)(int);     /* type of signal function */
  */
 #ifdef BSD_KERNEL_PRIVATE
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
 struct  user_sigaltstack {
        user_addr_t     ss_sp;          /* signal stack base */
        user_size_t     ss_size;        /* signal stack length */
-       int             ss_flags;       /* SA_DISABLE and/or SA_ONSTACK */
+       int             ss_flags __attribute((aligned(8)));     /* SA_DISABLE and/or SA_ONSTACK */
 };
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-
 #endif /* BSD_KERNEL_PRIVATE */
 
 #ifndef _STACK_T