workaround CF build failure, add resolvers for new symbol, whitespace

Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>

Author: das

private/private.h

@@ -199,10 +199,17 @@ DISPATCH_EXPORT DISPATCH_NOTHROW
 dispatch_runloop_handle_t
 _dispatch_get_main_queue_handle_4CF(void);
 
+#if TARGET_OS_MAC
+__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_4_0)
+DISPATCH_EXPORT DISPATCH_NOTHROW
+void
+_dispatch_main_queue_callback_4CF(mach_msg_header_t *_Null_unspecified msg);
+#else
 __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_4_0)
 DISPATCH_EXPORT DISPATCH_NOTHROW
 void
 _dispatch_main_queue_callback_4CF(void *_Null_unspecified msg);
+#endif
 
 __OSX_AVAILABLE_STARTING(__MAC_10_9,__IPHONE_7_0)
 DISPATCH_EXPORT DISPATCH_MALLOC DISPATCH_RETURNS_RETAINED DISPATCH_WARN_RESULT

src/queue.c

@@ -5707,7 +5707,7 @@ _dispatch_runloop_queue_handle_init(void *ctxt)
 	handle = fd;
 #else
 #error "runloop support not implemented on this platform"
-#endif	
+#endif
 	_dispatch_runloop_queue_set_handle(dq, handle);
 
 	_dispatch_program_is_probably_callback_driven = true;
@@ -5769,7 +5769,13 @@ _dispatch_queue_set_mainq_drain_state(bool arg)
 }
 
 void
-_dispatch_main_queue_callback_4CF(void *ignored DISPATCH_UNUSED)
+_dispatch_main_queue_callback_4CF(
+#if TARGET_OS_MAC
+		mach_msg_header_t *_Null_unspecified msg
+#else
+		void *ignored
+#endif
+		DISPATCH_UNUSED)
 {
 	if (main_q_is_draining) {
 		return;