[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 1b721c731da838e5878e655a7510f933da697fc0
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 15 00:13:34 2002 +0000

    	* Panels.subproj/IFStandardPanels.m: Use the read PTHREAD_ONCE_INIT,
    	remove the workaround for 2905545.
    
    	* IFWebCoreBridge.h: Moved into WebCoreSupport.subproj.
    	* IFWebCoreBridge.mm: Moved into WebCoreSupport.subproj.
    	* WebCoreSupport.subproj/IFWebCoreBridge.h: Moved from top level.
    	* WebCoreSupport.subproj/IFWebCoreBridge.mm: Moved from top level.
    
    	* WebKit.pbproj/project.pbxproj: Update for new file locations.
    	Also pass -no-c++filt so we get mangled names (more useful for .exp files),
    	and remove PFE_FILE_C_DIALECTS.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1362 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ef13f2a..3e32ada 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2002-06-14  Darin Adler  <darin at apple.com>
+
+	* Panels.subproj/IFStandardPanels.m: Use the read PTHREAD_ONCE_INIT,
+	remove the workaround for 2905545.
+
+	* IFWebCoreBridge.h: Moved into WebCoreSupport.subproj.
+	* IFWebCoreBridge.mm: Moved into WebCoreSupport.subproj.
+	* WebCoreSupport.subproj/IFWebCoreBridge.h: Moved from top level.
+	* WebCoreSupport.subproj/IFWebCoreBridge.mm: Moved from top level.
+
+	* WebKit.pbproj/project.pbxproj: Update for new file locations.
+	Also pass -no-c++filt so we get mangled names (more useful for .exp files),
+	and remove PFE_FILE_C_DIALECTS.
+
 2002-06-14  Chris Blumenberg  <cblu at apple.com>
 
 	* WebView.subproj/IFMainURLHandleClient.mm:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ef13f2a..3e32ada 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-06-14  Darin Adler  <darin at apple.com>
+
+	* Panels.subproj/IFStandardPanels.m: Use the read PTHREAD_ONCE_INIT,
+	remove the workaround for 2905545.
+
+	* IFWebCoreBridge.h: Moved into WebCoreSupport.subproj.
+	* IFWebCoreBridge.mm: Moved into WebCoreSupport.subproj.
+	* WebCoreSupport.subproj/IFWebCoreBridge.h: Moved from top level.
+	* WebCoreSupport.subproj/IFWebCoreBridge.mm: Moved from top level.
+
+	* WebKit.pbproj/project.pbxproj: Update for new file locations.
+	Also pass -no-c++filt so we get mangled names (more useful for .exp files),
+	and remove PFE_FILE_C_DIALECTS.
+
 2002-06-14  Chris Blumenberg  <cblu at apple.com>
 
 	* WebView.subproj/IFMainURLHandleClient.mm:
diff --git a/WebKit/Panels.subproj/IFStandardPanels.m b/WebKit/Panels.subproj/IFStandardPanels.m
index 5f0b8de..63a249d 100644
--- a/WebKit/Panels.subproj/IFStandardPanels.m
+++ b/WebKit/Panels.subproj/IFStandardPanels.m
@@ -67,9 +67,7 @@
     [super dealloc];
 }
 
-// The next line is a workaround for Radar 2905545. Once that's fixed, it can use PTHREAD_ONCE_INIT.
-pthread_once_t sharedStandardPanelsOnce = {_PTHREAD_ONCE_SIG_init, {}};
-IFStandardPanels *sharedStandardPanels = NULL;
+static IFStandardPanels *sharedStandardPanels = NULL;
 
 static void initSharedStandardPanels(void)
 {
@@ -78,6 +76,7 @@ static void initSharedStandardPanels(void)
 
 +(IFStandardPanels *)sharedStandardPanels
 {
+    static pthread_once_t sharedStandardPanelsOnce = PTHREAD_ONCE_INIT;
     pthread_once(&sharedStandardPanelsOnce, initSharedStandardPanels);
     return sharedStandardPanels;
 }
diff --git a/WebKit/Panels.subproj/WebStandardPanels.m b/WebKit/Panels.subproj/WebStandardPanels.m
index 5f0b8de..63a249d 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.m
+++ b/WebKit/Panels.subproj/WebStandardPanels.m
@@ -67,9 +67,7 @@
     [super dealloc];
 }
 
-// The next line is a workaround for Radar 2905545. Once that's fixed, it can use PTHREAD_ONCE_INIT.
-pthread_once_t sharedStandardPanelsOnce = {_PTHREAD_ONCE_SIG_init, {}};
-IFStandardPanels *sharedStandardPanels = NULL;
+static IFStandardPanels *sharedStandardPanels = NULL;
 
 static void initSharedStandardPanels(void)
 {
@@ -78,6 +76,7 @@ static void initSharedStandardPanels(void)
 
 +(IFStandardPanels *)sharedStandardPanels
 {
+    static pthread_once_t sharedStandardPanelsOnce = PTHREAD_ONCE_INIT;
     pthread_once(&sharedStandardPanelsOnce, initSharedStandardPanels);
     return sharedStandardPanels;
 }
diff --git a/WebKit/IFWebCoreBridge.h b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.h
similarity index 100%
copy from WebKit/IFWebCoreBridge.h
copy to WebKit/WebCoreSupport.subproj/IFWebCoreBridge.h
diff --git a/WebKit/IFWebCoreBridge.mm b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
similarity index 100%
copy from WebKit/IFWebCoreBridge.mm
copy to WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
diff --git a/WebKit/IFWebCoreBridge.h b/WebKit/WebCoreSupport.subproj/WebBridge.h
similarity index 100%
rename from WebKit/IFWebCoreBridge.h
rename to WebKit/WebCoreSupport.subproj/WebBridge.h
diff --git a/WebKit/IFWebCoreBridge.mm b/WebKit/WebCoreSupport.subproj/WebBridge.m
similarity index 100%
rename from WebKit/IFWebCoreBridge.mm
rename to WebKit/WebCoreSupport.subproj/WebBridge.m
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 4b57b25..8008c5d 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -139,8 +139,7 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OPTIMIZATION_CFLAGS = "-Os";
 				OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
-				OTHER_LDFLAGS = "-seg1addr 0x4000000";
-				PFE_FILE_C_DIALECTS = "objective-c objective-c++";
+				OTHER_LDFLAGS = "-seg1addr 0x4000000 -no-c++filt";
 				PRECOMPILE_PREFIX_HEADER = YES;
 				PREFIX_HEADER = WebKitPrefix.h;
 				PRODUCT_NAME = WebKit;
@@ -1677,12 +1676,14 @@
 		};
 		F5AFB45E02B94DC8018635CA = {
 			isa = PBXFileReference;
-			path = IFWebCoreBridge.h;
+			name = IFWebCoreBridge.h;
+			path = WebCoreSupport.subproj/IFWebCoreBridge.h;
 			refType = 4;
 		};
 		F5AFB45F02B94DC8018635CA = {
 			isa = PBXFileReference;
-			path = IFWebCoreBridge.mm;
+			name = IFWebCoreBridge.mm;
+			path = WebCoreSupport.subproj/IFWebCoreBridge.mm;
 			refType = 4;
 		};
 		F5AFB46002B94DC8018635CA = {

-- 
WebKit Debian packaging