[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 0f0ba9774a77995b8c43227b637cb55bc2363a74
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 15 20:04:35 2002 +0000

    	* WebFoundation.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.
    
    	* CacheLoader.subproj/IFHTTPURLProtocolHandler.m:
    	* CacheLoader.subproj/IFNetworkSettings.m:
    	* CacheLoader.subproj/IFURLLoad.m:
    	* CacheLoader.subproj/IFURLLoadManager.m:
    	* CookieManager.subproj/IFCookieManager.m:
    	* Database.subproj/IFURLFileDatabase.m:
    	* Misc.subproj/IFError.m:
    	* Misc.subproj/IFFileTypeMappings.m:
    	* Misc.subproj/IFNSThreadExtensions.m:
    	Use PTHREAD_ONCE_INIT now that the warning is fixed; also make some minor improvements to how
    	it's used, making some globals static rather than extern.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1372 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 304eb8f..9a732ad 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -18,9 +18,7 @@
 #define SIZE_FILE_NAME @".size"
 #define SIZE_FILE_NAME_CSTRING ".size"
 
-// The next line is a workaround for Radar 2905545. Once that's fixed, it can use PTHREAD_ONCE_INIT.
-static void databaseInit(void);
-static pthread_once_t databaseInitControl = {_PTHREAD_ONCE_SIG_init, {}};
+static pthread_once_t databaseInitControl = PTHREAD_ONCE_INIT;
 static NSNumber *IFURLFileDirectoryPosixPermissions;
 static NSNumber *IFURLFilePosixPermissions;
 
@@ -122,9 +120,6 @@ static CFArrayRef CreateArrayListingFilesSortedByAccessTime(const char *path) {
 static NSMutableSet *notMappableFileNameSet = nil;
 static NSLock *mutex;
 
-// The next line is a workaround for Radar 2905545. Once that's fixed, it can use PTHREAD_ONCE_INIT.
-static pthread_once_t cacheFileReaderControl = {_PTHREAD_ONCE_SIG_init, {}};
-
 static void URLFileReaderInit(void)
 {
     mutex = [[NSLock alloc] init];
@@ -139,6 +134,7 @@ static void URLFileReaderInit(void)
     struct stat statInfo;
     const char *fileSystemPath;
     BOOL fileNotMappable;
+    static pthread_once_t cacheFileReaderControl = PTHREAD_ONCE_INIT;
 
     pthread_once(&cacheFileReaderControl, URLFileReaderInit);
 

-- 
WebKit Debian packaging