xnu-3248.50.21.tar.gz

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

diff --git a/bsd/sys/shm.h b/bsd/sys/shm.h
index 40ac2ea530534c0c4ea03d16cc49b017844a0c6e..150261adc3d7014f869d5b26f95a469a125aa1ff 100644 (file)
--- a/bsd/sys/shm.h
+++ b/bsd/sys/shm.h
@@ -81,20 +81,9 @@
  * NOTE:       The definition of the key_t type is implicit from the
  *             inclusion of <sys/ipc.h>
  */
-#ifndef _PID_T
-typedef __darwin_pid_t pid_t;
-#define _PID_T
-#endif
-
-#ifndef        _TIME_T
-#define        _TIME_T
-typedef        __darwin_time_t time_t;
-#endif
-
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef __darwin_size_t        size_t;
-#endif
+#include <sys/_types/_pid_t.h>
+#include <sys/_types/_time_t.h>
+#include <sys/_types/_size_t.h>
 
 /*
  * [XSI] The unsigned integer type used for the number of current attaches
@@ -127,6 +116,8 @@ typedef unsigned short      shmatt_t;
 #define SHM_R       (IPC_R)
 #define SHM_W       (IPC_W)
 
+#pragma pack(4)
+
 /*
  * Technically, we should force all code references to the new structure
  * definition, not in just the standards conformance case, and leave the
@@ -178,6 +169,8 @@ struct __shmid_ds_old {
 };
 #endif /* !__DARWIN_UNIX03 */
 
+#pragma pack()
+
 #ifndef KERNEL
 
 __BEGIN_DECLS