[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:19:25 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 4fab5afd3bbca9ce2196fee0bc987ff90788a27c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jun 15 19:59:07 2002 +0000
* 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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1371 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 04437f6..e6aee88 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2002-06-15 Darin Adler <darin at apple.com>
+
+ * 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.
+
2002-06-15 Maciej Stachowiak <mjs at apple.com>
Made Development build mode mean what Unoptimized used to mean. Removed Unoptimized build mode.
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 04437f6..e6aee88 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-06-15 Darin Adler <darin at apple.com>
+
+ * 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.
+
2002-06-15 Maciej Stachowiak <mjs at apple.com>
Made Development build mode mean what Unoptimized used to mean. Removed Unoptimized build mode.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 04437f6..e6aee88 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-06-15 Darin Adler <darin at apple.com>
+
+ * 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.
+
2002-06-15 Maciej Stachowiak <mjs at apple.com>
Made Development build mode mean what Unoptimized used to mean. Removed Unoptimized build mode.
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 10f3774..c7db710 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -125,16 +125,12 @@
LIBRARY_SEARCH_PATHS = "";
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
- PFE_FILE_C_DIALECTS = "c++";
PRECOMPILE_PREFIX_HEADER = YES;
PREFIX_HEADER = JavaScriptCorePrefix.h;
PRODUCT_NAME = JavaScriptCore;
SECTORDER_FLAGS = "";
- USE_GCC3 = YES;
USE_GCC3_PFE_SUPPORT = YES;
- WARNING_CFLAGS = "$(WARNING_COMMONFLAGS)";
- WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
- WARNING_CPLUSPLUSFLAGS = "$(WARNING_COMMONFLAGS)";
+ WARNING_CFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
WRAPPER_EXTENSION = framework;
};
dependencies = (
diff --git a/JavaScriptCore/kjs/collector.cpp b/JavaScriptCore/kjs/collector.cpp
index 59becdc..f5f5653 100644
--- a/JavaScriptCore/kjs/collector.cpp
+++ b/JavaScriptCore/kjs/collector.cpp
@@ -67,10 +67,8 @@ CollectorBlock::~CollectorBlock()
}
#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;
#endif
diff --git a/JavaScriptCore/kjs/internal.cpp b/JavaScriptCore/kjs/internal.cpp
index 4258f07..366bbb1 100644
--- a/JavaScriptCore/kjs/internal.cpp
+++ b/JavaScriptCore/kjs/internal.cpp
@@ -689,7 +689,7 @@ void ContextImp::popScope()
ProgramNode *Parser::progNode = 0;
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
ProgramNode *Parser::parse(const UChar *code, unsigned int length, int *sourceId,
diff --git a/JavaScriptCore/kjs/ustring.cpp b/JavaScriptCore/kjs/ustring.cpp
index 13be9c8..7906c80 100644
--- a/JavaScriptCore/kjs/ustring.cpp
+++ b/JavaScriptCore/kjs/ustring.cpp
@@ -126,9 +126,8 @@ UString::Rep UString::Rep::null = { 0, 0, 1 };
#endif
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;
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list