From c1d0fec9b838e4df93e396d54f1e4b9a41f7401a Mon Sep 17 00:00:00 2001
From: guenther <>
Date: Tue, 5 Sep 2017 02:40:54 +0000
Subject: Move mutex, condvar, and thread-specific data routes, pthread_once,
 and pthread_exit from libpthread to libc, along with low-level bits to
 support them.  Major bump to both libc and libpthread.

Requested by libressl team.  Ports testing by naddy@
ok kettenis@
---
 src/lib/libc/include/cancel.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/lib/libc/include/cancel.h')

diff --git a/src/lib/libc/include/cancel.h b/src/lib/libc/include/cancel.h
index 2c87be39e3..c452bf3d4c 100644
--- a/src/lib/libc/include/cancel.h
+++ b/src/lib/libc/include/cancel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cancel.h,v 1.4 2017/04/20 17:16:32 visa Exp $ */
+/*	$OpenBSD: cancel.h,v 1.5 2017/09/05 02:40:54 guenther Exp $ */
 /*
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
  *
@@ -21,10 +21,12 @@
 #include <tib.h>
 #include "thread_private.h"
 
-__BEGIN_HIDDEN_DECLS
 /* process a cancel request at a cancel point */
 __dead void	_thread_canceled(void);
-__END_HIDDEN_DECLS
+
+#ifdef __LIBC__
+PROTO_NORMAL(_thread_canceled);
+#endif
 
 #if defined(__LIBC__) && !defined(TCB_HAVE_MD_GET)
 /*
-- 
cgit v1.2.3-55-g6feb