Merge pull request #457 from triplef/fix-signatures

ktopley-apple · web-flow · commit f20349fbe762 · 2019-03-20T14:32:48.000-07:00
Fixed conflicting method signature for _dispatch_install_thread_detach_callback()
diff --git a/src/queue.c b/src/queue.c
@@ -7331,7 +7331,7 @@ gettid(void)
 static void (*_dispatch_thread_detach_callback)(void);
 
 void
-_dispatch_install_thread_detach_callback(dispatch_function_t cb)
+_dispatch_install_thread_detach_callback(void (*cb)(void))
 {
 	if (os_atomic_xchg(&_dispatch_thread_detach_callback, cb, relaxed)) {
 		DISPATCH_CLIENT_CRASH(0, "Installing a thread detach callback twice");

Original file line number	Diff line number	Diff line change
`@@ -7331,7 +7331,7 @@ gettid(void)`
`7331`	`7331`	`static void (*_dispatch_thread_detach_callback)(void);`
`7332`	`7332`
`7333`	`7333`	`void`
`7334`		`-_dispatch_install_thread_detach_callback(dispatch_function_t cb)`
	`7334`	`+_dispatch_install_thread_detach_callback(void (*cb)(void))`
`7335`	`7335`	`{`
`7336`	`7336`	`if (os_atomic_xchg(&_dispatch_thread_detach_callback, cb, relaxed)) {`
`7337`	`7337`	`DISPATCH_CLIENT_CRASH(0, "Installing a thread detach callback twice");`