Module Name:    src
Committed By:   riastradh
Date:           Sat Feb 12 14:59:32 UTC 2022

Modified Files:
        src/lib/libpthread: pthread.c pthread_attr.c pthread_barrier.c
            pthread_cancelstub.c pthread_compat.c pthread_cond.c
            pthread_getcpuclockid.c pthread_int.h pthread_lock.c
            pthread_makelwp_netbsd.c pthread_misc.c pthread_mutex.c
            pthread_once.c pthread_rwlock.c pthread_specific.c pthread_spin.c
            pthread_tsd.c res_state.c

Log Message:
libpthread: Move namespacing include to top of .c files.

Stuff like libc's namespace.h, or atomic_op_namespace.h, which does
namespacing tricks like `#define atomic_cas_uint _atomic_cas_uint',
has to go at the top of each .c file.  If it goes in the middle, it
might be too late to affect the declarations, and result in compile
errors.

I tripped over this by including <sys/atomic.h> in mips
<machine/lock.h>.

(Maybe we should create a new pthread_namespace.h file for the
purpose, but this'll do for now.)


To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/lib/libpthread/pthread.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libpthread/pthread_attr.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libpthread/pthread_barrier.c
cvs rdiff -u -r1.40 -r1.41 src/lib/libpthread/pthread_cancelstub.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libpthread/pthread_compat.c \
    src/lib/libpthread/res_state.c
cvs rdiff -u -r1.76 -r1.77 src/lib/libpthread/pthread_cond.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libpthread/pthread_getcpuclockid.c \
    src/lib/libpthread/pthread_once.c
cvs rdiff -u -r1.107 -r1.108 src/lib/libpthread/pthread_int.h
cvs rdiff -u -r1.34 -r1.35 src/lib/libpthread/pthread_lock.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libpthread/pthread_makelwp_netbsd.c
cvs rdiff -u -r1.17 -r1.18 src/lib/libpthread/pthread_misc.c
cvs rdiff -u -r1.81 -r1.82 src/lib/libpthread/pthread_mutex.c
cvs rdiff -u -r1.43 -r1.44 src/lib/libpthread/pthread_rwlock.c
cvs rdiff -u -r1.26 -r1.27 src/lib/libpthread/pthread_specific.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libpthread/pthread_spin.c
cvs rdiff -u -r1.23 -r1.24 src/lib/libpthread/pthread_tsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.179 src/lib/libpthread/pthread.c:1.180
--- src/lib/libpthread/pthread.c:1.179	Tue Apr 13 00:31:54 2021
+++ src/lib/libpthread/pthread.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread.c,v 1.179 2021/04/13 00:31:54 mrg Exp $	*/
+/*	$NetBSD: pthread.c,v 1.180 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008, 2020
@@ -31,10 +31,13 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread.c,v 1.179 2021/04/13 00:31:54 mrg Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.180 2022/02/12 14:59:32 riastradh Exp $");
 
 #define	__EXPOSE_STACK	1
 
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
+
 #include <sys/param.h>
 #include <sys/exec_elf.h>
 #include <sys/mman.h>

Index: src/lib/libpthread/pthread_attr.c
diff -u src/lib/libpthread/pthread_attr.c:1.19 src/lib/libpthread/pthread_attr.c:1.20
--- src/lib/libpthread/pthread_attr.c:1.19	Wed Jan 29 13:47:31 2020
+++ src/lib/libpthread/pthread_attr.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_attr.c,v 1.19 2020/01/29 13:47:31 kamil Exp $	*/
+/*	$NetBSD: pthread_attr.c,v 1.20 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_attr.c,v 1.19 2020/01/29 13:47:31 kamil Exp $");
+__RCSID("$NetBSD: pthread_attr.c,v 1.20 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #include <errno.h>
 #include <stdio.h>

Index: src/lib/libpthread/pthread_barrier.c
diff -u src/lib/libpthread/pthread_barrier.c:1.22 src/lib/libpthread/pthread_barrier.c:1.23
--- src/lib/libpthread/pthread_barrier.c:1.22	Sat May 16 22:53:37 2020
+++ src/lib/libpthread/pthread_barrier.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_barrier.c,v 1.22 2020/05/16 22:53:37 ad Exp $	*/
+/*	$NetBSD: pthread_barrier.c,v 1.23 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2003, 2006, 2007, 2009, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_barrier.c,v 1.22 2020/05/16 22:53:37 ad Exp $");
+__RCSID("$NetBSD: pthread_barrier.c,v 1.23 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #include <errno.h>
 

Index: src/lib/libpthread/pthread_cancelstub.c
diff -u src/lib/libpthread/pthread_cancelstub.c:1.40 src/lib/libpthread/pthread_cancelstub.c:1.41
--- src/lib/libpthread/pthread_cancelstub.c:1.40	Fri Oct  1 20:13:38 2021
+++ src/lib/libpthread/pthread_cancelstub.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_cancelstub.c,v 1.40 2021/10/01 20:13:38 christos Exp $	*/
+/*	$NetBSD: pthread_cancelstub.c,v 1.41 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -33,7 +33,10 @@
 #undef _FORTIFY_SOURCE
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_cancelstub.c,v 1.40 2021/10/01 20:13:38 christos Exp $");
+__RCSID("$NetBSD: pthread_cancelstub.c,v 1.41 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #ifndef lint
 

Index: src/lib/libpthread/pthread_compat.c
diff -u src/lib/libpthread/pthread_compat.c:1.6 src/lib/libpthread/pthread_compat.c:1.7
--- src/lib/libpthread/pthread_compat.c:1.6	Fri Dec  8 09:59:26 2017
+++ src/lib/libpthread/pthread_compat.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_compat.c,v 1.6 2017/12/08 09:59:26 kre Exp $	*/
+/*	$NetBSD: pthread_compat.c,v 1.7 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_compat.c,v 1.6 2017/12/08 09:59:26 kre Exp $");
+__RCSID("$NetBSD: pthread_compat.c,v 1.7 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #include <sys/param.h>
 #include <sys/syscall.h>
Index: src/lib/libpthread/res_state.c
diff -u src/lib/libpthread/res_state.c:1.6 src/lib/libpthread/res_state.c:1.7
--- src/lib/libpthread/res_state.c:1.6	Mon Apr 28 20:23:02 2008
+++ src/lib/libpthread/res_state.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: res_state.c,v 1.6 2008/04/28 20:23:02 martin Exp $	*/
+/*	$NetBSD: res_state.c,v 1.7 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -31,9 +31,12 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: res_state.c,v 1.6 2008/04/28 20:23:02 martin Exp $");
+__RCSID("$NetBSD: res_state.c,v 1.7 2022/02/12 14:59:32 riastradh Exp $");
 #endif
 
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
+
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <arpa/inet.h>

Index: src/lib/libpthread/pthread_cond.c
diff -u src/lib/libpthread/pthread_cond.c:1.76 src/lib/libpthread/pthread_cond.c:1.77
--- src/lib/libpthread/pthread_cond.c:1.76	Sun Jun 14 21:33:28 2020
+++ src/lib/libpthread/pthread_cond.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_cond.c,v 1.76 2020/06/14 21:33:28 ad Exp $	*/
+/*	$NetBSD: pthread_cond.c,v 1.77 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_cond.c,v 1.76 2020/06/14 21:33:28 ad Exp $");
+__RCSID("$NetBSD: pthread_cond.c,v 1.77 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #include <stdlib.h>
 #include <errno.h>

Index: src/lib/libpthread/pthread_getcpuclockid.c
diff -u src/lib/libpthread/pthread_getcpuclockid.c:1.3 src/lib/libpthread/pthread_getcpuclockid.c:1.4
--- src/lib/libpthread/pthread_getcpuclockid.c:1.3	Wed Jan 29 16:03:44 2020
+++ src/lib/libpthread/pthread_getcpuclockid.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_getcpuclockid.c,v 1.3 2020/01/29 16:03:44 kamil Exp $	*/
+/*	$NetBSD: pthread_getcpuclockid.c,v 1.4 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,9 +30,12 @@
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pthread_getcpuclockid.c,v 1.3 2020/01/29 16:03:44 kamil Exp $");
+__RCSID("$NetBSD: pthread_getcpuclockid.c,v 1.4 2022/02/12 14:59:32 riastradh Exp $");
 #endif /* LIBC_SCCS and not lint */
 
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
+
 #include <sys/types.h>
 #include <errno.h>
 #include <pthread.h>
Index: src/lib/libpthread/pthread_once.c
diff -u src/lib/libpthread/pthread_once.c:1.3 src/lib/libpthread/pthread_once.c:1.4
--- src/lib/libpthread/pthread_once.c:1.3	Thu Mar 21 16:49:12 2013
+++ src/lib/libpthread/pthread_once.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_once.c,v 1.3 2013/03/21 16:49:12 christos Exp $	*/
+/*	$NetBSD: pthread_once.c,v 1.4 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_once.c,v 1.3 2013/03/21 16:49:12 christos Exp $");
+__RCSID("$NetBSD: pthread_once.c,v 1.4 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #include "pthread.h"
 #include "pthread_int.h"

Index: src/lib/libpthread/pthread_int.h
diff -u src/lib/libpthread/pthread_int.h:1.107 src/lib/libpthread/pthread_int.h:1.108
--- src/lib/libpthread/pthread_int.h:1.107	Wed Jun 10 22:45:15 2020
+++ src/lib/libpthread/pthread_int.h	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_int.h,v 1.107 2020/06/10 22:45:15 ad Exp $	*/
+/*	$NetBSD: pthread_int.h,v 1.108 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008, 2020
@@ -41,9 +41,6 @@
 #include "pthread_queue.h"
 #include "pthread_md.h"
 
-/* Need to use libc-private names for atomic operations. */
-#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
-
 #include <sys/atomic.h>
 #include <sys/rbtree.h>
 #include <sys/param.h>

Index: src/lib/libpthread/pthread_lock.c
diff -u src/lib/libpthread/pthread_lock.c:1.34 src/lib/libpthread/pthread_lock.c:1.35
--- src/lib/libpthread/pthread_lock.c:1.34	Mon Apr 28 20:23:01 2008
+++ src/lib/libpthread/pthread_lock.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_lock.c,v 1.34 2008/04/28 20:23:01 martin Exp $	*/
+/*	$NetBSD: pthread_lock.c,v 1.35 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_lock.c,v 1.34 2008/04/28 20:23:01 martin Exp $");
+__RCSID("$NetBSD: pthread_lock.c,v 1.35 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #include <sys/types.h>
 #include <sys/ras.h>

Index: src/lib/libpthread/pthread_makelwp_netbsd.c
diff -u src/lib/libpthread/pthread_makelwp_netbsd.c:1.2 src/lib/libpthread/pthread_makelwp_netbsd.c:1.3
--- src/lib/libpthread/pthread_makelwp_netbsd.c:1.2	Wed Dec 17 01:49:08 2014
+++ src/lib/libpthread/pthread_makelwp_netbsd.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_makelwp_netbsd.c,v 1.2 2014/12/17 01:49:08 pooka Exp $	*/
+/*	$NetBSD: pthread_makelwp_netbsd.c,v 1.3 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_makelwp_netbsd.c,v 1.2 2014/12/17 01:49:08 pooka Exp $");
+__RCSID("$NetBSD: pthread_makelwp_netbsd.c,v 1.3 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #include <sys/param.h>
 

Index: src/lib/libpthread/pthread_misc.c
diff -u src/lib/libpthread/pthread_misc.c:1.17 src/lib/libpthread/pthread_misc.c:1.18
--- src/lib/libpthread/pthread_misc.c:1.17	Wed Jan 29 16:34:09 2020
+++ src/lib/libpthread/pthread_misc.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_misc.c,v 1.17 2020/01/29 16:34:09 kamil Exp $	*/
+/*	$NetBSD: pthread_misc.c,v 1.18 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_misc.c,v 1.17 2020/01/29 16:34:09 kamil Exp $");
+__RCSID("$NetBSD: pthread_misc.c,v 1.18 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #include <errno.h>
 #include <string.h>

Index: src/lib/libpthread/pthread_mutex.c
diff -u src/lib/libpthread/pthread_mutex.c:1.81 src/lib/libpthread/pthread_mutex.c:1.82
--- src/lib/libpthread/pthread_mutex.c:1.81	Thu Jun 11 18:41:22 2020
+++ src/lib/libpthread/pthread_mutex.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_mutex.c,v 1.81 2020/06/11 18:41:22 ad Exp $	*/
+/*	$NetBSD: pthread_mutex.c,v 1.82 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2003, 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
@@ -47,7 +47,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_mutex.c,v 1.81 2020/06/11 18:41:22 ad Exp $");
+__RCSID("$NetBSD: pthread_mutex.c,v 1.82 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #include <sys/types.h>
 #include <sys/lwpctl.h>

Index: src/lib/libpthread/pthread_rwlock.c
diff -u src/lib/libpthread/pthread_rwlock.c:1.43 src/lib/libpthread/pthread_rwlock.c:1.44
--- src/lib/libpthread/pthread_rwlock.c:1.43	Fri Feb 11 21:40:58 2022
+++ src/lib/libpthread/pthread_rwlock.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_rwlock.c,v 1.43 2022/02/11 21:40:58 riastradh Exp $ */
+/*	$NetBSD: pthread_rwlock.c,v 1.44 2022/02/12 14:59:32 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_rwlock.c,v 1.43 2022/02/11 21:40:58 riastradh Exp $");
+__RCSID("$NetBSD: pthread_rwlock.c,v 1.44 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #include <sys/types.h>
 #include <sys/lwpctl.h>

Index: src/lib/libpthread/pthread_specific.c
diff -u src/lib/libpthread/pthread_specific.c:1.26 src/lib/libpthread/pthread_specific.c:1.27
--- src/lib/libpthread/pthread_specific.c:1.26	Thu Mar 21 16:49:12 2013
+++ src/lib/libpthread/pthread_specific.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_specific.c,v 1.26 2013/03/21 16:49:12 christos Exp $	*/
+/*	$NetBSD: pthread_specific.c,v 1.27 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_specific.c,v 1.26 2013/03/21 16:49:12 christos Exp $");
+__RCSID("$NetBSD: pthread_specific.c,v 1.27 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 /* Functions and structures dealing with thread-specific data */
 

Index: src/lib/libpthread/pthread_spin.c
diff -u src/lib/libpthread/pthread_spin.c:1.8 src/lib/libpthread/pthread_spin.c:1.9
--- src/lib/libpthread/pthread_spin.c:1.8	Wed Feb  5 11:05:10 2020
+++ src/lib/libpthread/pthread_spin.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_spin.c,v 1.8 2020/02/05 11:05:10 kamil Exp $	*/
+/*	$NetBSD: pthread_spin.c,v 1.9 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_spin.c,v 1.8 2020/02/05 11:05:10 kamil Exp $");
+__RCSID("$NetBSD: pthread_spin.c,v 1.9 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 #include <sys/types.h>
 #include <sys/ras.h>

Index: src/lib/libpthread/pthread_tsd.c
diff -u src/lib/libpthread/pthread_tsd.c:1.23 src/lib/libpthread/pthread_tsd.c:1.24
--- src/lib/libpthread/pthread_tsd.c:1.23	Thu Jun 11 18:42:02 2020
+++ src/lib/libpthread/pthread_tsd.c	Sat Feb 12 14:59:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_tsd.c,v 1.23 2020/06/11 18:42:02 ad Exp $	*/
+/*	$NetBSD: pthread_tsd.c,v 1.24 2022/02/12 14:59:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2007, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_tsd.c,v 1.23 2020/06/11 18:42:02 ad Exp $");
+__RCSID("$NetBSD: pthread_tsd.c,v 1.24 2022/02/12 14:59:32 riastradh Exp $");
+
+/* Need to use libc-private names for atomic operations. */
+#include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 
 /* Functions and structures dealing with thread-specific data */
 #include <errno.h>

Reply via email to