X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/e2fac8b15b12a7979f72090454d850e612fc5b13..b0d623f7f2ae71ed96e60569f61f9a9a27016e80:/osfmk/mach/port.h?ds=inline

diff --git a/osfmk/mach/port.h b/osfmk/mach/port.h
index 5e1186540..9db876f17 100644
--- a/osfmk/mach/port.h
+++ b/osfmk/mach/port.h
@@ -140,13 +140,21 @@ struct ipc_port ;
 
 typedef struct ipc_port	        *ipc_port_t;
 
-#define IPC_PORT_NULL		((ipc_port_t) 0)
-#define IPC_PORT_DEAD		((ipc_port_t)~0)
+#define IPC_PORT_NULL		((ipc_port_t) 0UL)
+#define IPC_PORT_DEAD		((ipc_port_t)~0UL)
 #define IPC_PORT_VALID(port) \
 	((port) != IPC_PORT_NULL && (port) != IPC_PORT_DEAD)
 
 typedef ipc_port_t 		mach_port_t;
 
+/*
+ * Since the 32-bit and 64-bit representations of ~0 are different,
+ * explicitly handle MACH_PORT_DEAD
+ */
+
+#define CAST_MACH_PORT_TO_NAME(x) ((mach_port_name_t)(uintptr_t)(x))
+#define CAST_MACH_NAME_TO_PORT(x) ((x) == MACH_PORT_DEAD ? (mach_port_t)IPC_PORT_DEAD : (mach_port_t)(uintptr_t)(x))
+
 #else	/* KERNEL */
 
 /*