Changeset 1371 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jun 15, 2002, 12:59:07 PM (23 years ago)

Author:

darin

Message:

• JavaScriptCore.pbproj/project.pbxproj: Removed explicit PFE_FILE_C_DIALECTS now that Project Builder handles this automatically. Removed explicit USE_GCC3 since that's implicit now. Also, since this project is all C++, only use WARNING_CFLAGS with flags that are appropriate for C++; don't bother breaking out C vs. C++.

• kjs/collector.cpp: Now that the system warning is fixed, use PTHREAD_MUTEX_INITIALIZER and PTHREAD_COND_INITIALIZER.
• kjs/internal.cpp: Use PTHREAD_MUTEX_INITIALIZER.
• kjs/ustring.cpp: Use PTHREAD_ONCE_INIT.

Location:

trunk/JavaScriptCore/kjs

Files:

• collector.cpp (modified) (1 diff)
• internal.cpp (modified) (1 diff)
• ustring.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -68 +68 @@
 
 #ifdef APPLE_CHANGES
-// FIXME: fix these once static initializers for pthread_cond_t and
-// pthread_mutex_t are fixed not to warn.
-static pthread_mutex_t collectorLock = {_PTHREAD_MUTEX_SIG_init, {}};
-static pthread_cond_t collectorCondition = {_PTHREAD_COND_SIG_init, {}};
+static pthread_mutex_t collectorLock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t collectorCondition = PTHREAD_COND_INITIALIZER;
 static unsigned collectorLockCount = 0;
 static pthread_t collectorLockThread;

trunk/JavaScriptCore/kjs/internal.cpp

@@ -690 +690 @@
 int Parser::sid = 0;
 #ifdef APPLE_CHANGES
-static pthread_mutex_t parserLock = {_PTHREAD_MUTEX_SIG_init, {}};
+static pthread_mutex_t parserLock = PTHREAD_MUTEX_INITIALIZER;
 #endif
 

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -127 +127 @@
 UString UString::null;
 #ifdef APPLE_CHANGES
-// FIXME: fix this once static initializers for pthread_once_t
-pthread_once_t statBufferKeyOnce = {_PTHREAD_ONCE_SIG_init, {}};
-pthread_key_t statBufferKey;
+static pthread_once_t statBufferKeyOnce = PTHREAD_ONCE_INIT;
+static pthread_key_t statBufferKey;
 #else
 static char *statBuffer = 0L;