X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/378393581903b274cb7a4d18e0d978071a6b592d..0c530ab8987f0ae6a1a3d9284f40182b88852816:/bsd/sys/lock.h?ds=sidebyside

diff --git a/bsd/sys/lock.h b/bsd/sys/lock.h
index 5364f66e1..ec098b61a 100644
--- a/bsd/sys/lock.h
+++ b/bsd/sys/lock.h
@@ -70,13 +70,6 @@
 
 #include <kern/locks.h>
 
-
-#if defined(thread_sleep_simple_lock)
-#undef thread_sleep_simple_lock
-#endif
-#define thread_sleep_simple_lock(l, e, i) thread_sleep_funnel((e), (i))
-
-
 #endif /* KERNEL */
 
 #ifdef BSD_KERNEL_PRIVATE
@@ -105,10 +98,6 @@ struct lock__bsd__ {
  * WARNING - keep in sync with lock__bsd__
  */
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
 struct user_lock__bsd__ {
 	user_addr_t	lk_interlock[10];   /* lock on remaining fields */
 	u_int		lk_flags;			/* see below */
@@ -122,10 +111,6 @@ struct user_lock__bsd__ {
 	user_addr_t	lk_lockthread;		/* thread which acquired excl lock */
 };
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-
 /*
  * Lock request types:
  *   LK_SHARED - get one of many possible shared locks. If a process