summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLandry Breuil <landry@cvs.openbsd.org>2012-11-05 08:58:40 +0000
committerLandry Breuil <landry@cvs.openbsd.org>2012-11-05 08:58:40 +0000
commit4b3595a2368eb10da259bbd852e7e3f2af1271ff (patch)
tree7acedeb0b7a9d3ddde43eb49f5de6e4e8a659e06 /lib
parent08444a2df58aeb24fe13b887128b17b07d17ff18 (diff)
typedef pthread_key_t to an int instead of a volatile int, reverts a chunk
from r1.11. This allows webkit with --enable-debug to build, and is in line with what FreeBSD/NetBSD uses. ok kettenis@ guenther@
Diffstat (limited to 'lib')
-rw-r--r--lib/libpthread/include/pthread.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libpthread/include/pthread.h b/lib/libpthread/include/pthread.h
index 36850b81da6..514b8eb10c5 100644
--- a/lib/libpthread/include/pthread.h
+++ b/lib/libpthread/include/pthread.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pthread.h,v 1.37 2012/05/14 23:21:35 matthew Exp $ */
+/* $OpenBSD: pthread.h,v 1.38 2012/11/05 08:58:39 landry Exp $ */
/*
* Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
@@ -116,7 +116,7 @@ typedef volatile struct pthread_mutex *pthread_mutex_t;
typedef struct pthread_mutex_attr *pthread_mutexattr_t;
typedef struct pthread_cond *pthread_cond_t;
typedef struct pthread_cond_attr *pthread_condattr_t;
-typedef volatile int pthread_key_t;
+typedef int pthread_key_t;
typedef struct pthread_once pthread_once_t;
typedef struct pthread_rwlock *pthread_rwlock_t;
typedef struct pthread_rwlockattr *pthread_rwlockattr_t;