summaryrefslogtreecommitdiffstats
path: root/lib/libc
diff options
context:
space:
mode:
authorjb <jb@FreeBSD.org>1998-04-04 11:03:07 +0000
committerjb <jb@FreeBSD.org>1998-04-04 11:03:07 +0000
commit43c228762029d6d4e7c66cfd6c4d1e88d807dba1 (patch)
treef50c6d9926013635df61dc702de9b57aa27f5af4 /lib/libc
parent0982c14667ebe8ecb1a107c9246e9b17008840fa (diff)
downloadFreeBSD-src-43c228762029d6d4e7c66cfd6c4d1e88d807dba1.zip
FreeBSD-src-43c228762029d6d4e7c66cfd6c4d1e88d807dba1.tar.gz
Change in name of the static initializer define.
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/gen/ttyname.c2
-rw-r--r--lib/libc/stdlib/malloc.c4
-rw-r--r--lib/libc/stdtime/localtime.c8
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index be2de59..c768f59 100644
--- a/lib/libc/gen/ttyname.c
+++ b/lib/libc/gen/ttyname.c
@@ -49,7 +49,7 @@ static char sccsid[] = "@(#)ttyname.c 8.2 (Berkeley) 1/27/94";
#ifdef _THREAD_SAFE
#include <pthread.h>
#include "pthread_private.h"
-static struct pthread_mutex _ttyname_lockd = PTHREAD_MUTEX_INITIALIZER;
+static struct pthread_mutex _ttyname_lockd = PTHREAD_MUTEX_STATIC_INITIALIZER;
static pthread_mutex_t ttyname_lock = &_ttyname_lockd;
static pthread_key_t ttyname_key;
static int ttyname_init = 0;
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 4cbca9c..0782598 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id: malloc.c,v 1.34 1997/12/31 03:15:06 alex Exp $
+ * $Id: malloc.c,v 1.35 1998/03/09 07:00:38 jb Exp $
*
*/
@@ -56,7 +56,7 @@
# define THREAD_STATUS int thread_lock_status;
# define THREAD_LOCK() _thread_kern_sig_block(&thread_lock_status);
# define THREAD_UNLOCK() _thread_kern_sig_unblock(thread_lock_status);
- static struct pthread_mutex _malloc_lock = PTHREAD_MUTEX_INITIALIZER;
+ static struct pthread_mutex _malloc_lock = PTHREAD_MUTEX_STATIC_INITIALIZER;
static pthread_mutex_t malloc_lock = &_malloc_lock;
# endif
#endif /* __FreeBSD__ */
diff --git a/lib/libc/stdtime/localtime.c b/lib/libc/stdtime/localtime.c
index 204bac0..5de39d6 100644
--- a/lib/libc/stdtime/localtime.c
+++ b/lib/libc/stdtime/localtime.c
@@ -171,8 +171,8 @@ static char lcl_TZname[TZ_STRLEN_MAX + 1];
static int lcl_is_set;
static int gmt_is_set;
#ifdef _THREAD_SAFE
-static struct pthread_mutex _lcl_mutexd = PTHREAD_MUTEX_INITIALIZER;
-static struct pthread_mutex _gmt_mutexd = PTHREAD_MUTEX_INITIALIZER;
+static struct pthread_mutex _lcl_mutexd = PTHREAD_MUTEX_STATIC_INITIALIZER;
+static struct pthread_mutex _gmt_mutexd = PTHREAD_MUTEX_STATIC_INITIALIZER;
static pthread_mutex_t lcl_mutex = &_lcl_mutexd;
static pthread_mutex_t gmt_mutex = &_gmt_mutexd;
#endif
@@ -1096,7 +1096,7 @@ localtime(timep)
const time_t * const timep;
{
#ifdef _THREAD_SAFE
- static struct pthread_mutex _localtime_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static struct pthread_mutex _localtime_mutex = PTHREAD_MUTEX_STATIC_INITIALIZER;
static pthread_mutex_t localtime_mutex = &_localtime_mutex;
static pthread_key_t localtime_key = -1;
struct tm *p_tm;
@@ -1178,7 +1178,7 @@ gmtime(timep)
const time_t * const timep;
{
#ifdef _THREAD_SAFE
- static struct pthread_mutex _gmtime_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static struct pthread_mutex _gmtime_mutex = PTHREAD_MUTEX_STATIC_INITIALIZER;
static pthread_mutex_t gmtime_mutex = &_gmtime_mutex;
static pthread_key_t gmtime_key = -1;
struct tm *p_tm;
OpenPOWER on IntegriCloud