xnu-792.21.3.tar.gz

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

diff --git a/bsd/sys/socket.h b/bsd/sys/socket.h
index d28b5fd73b8eb75f0f2193d41690a99dc551dea0..5e1b2545a38ba276c47a266f400c1fe1ad60ead3 100644 (file)
--- a/bsd/sys/socket.h
+++ b/bsd/sys/socket.h
@@ -491,17 +491,24 @@ struct msghdr {
  * grow when we're dealing with a 64-bit process.
  * WARNING - keep in sync with struct msghdr
  */
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=natural
+#endif
 
 struct user_msghdr {
        user_addr_t     msg_name;               /* optional address */
        socklen_t       msg_namelen;            /* size of address */
-       user_addr_t     msg_iov __attribute((aligned(8)));              /* scatter/gather array */
+       user_addr_t     msg_iov;                /* scatter/gather array */
        int             msg_iovlen;             /* # elements in msg_iov */
-       user_addr_t     msg_control __attribute((aligned(8)));          /* ancillary data, see below */
+       user_addr_t     msg_control;            /* ancillary data, see below */
        socklen_t       msg_controllen;         /* ancillary data buffer len */
        int             msg_flags;              /* flags on received message */
 };
 
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=reset
+#endif
+
 #endif // KERNEL
 
 #define        MSG_OOB         0x1             /* process out-of-band data */