[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 07:15:57 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit b886379cfd19e266a42b29149ee1d27b2b99baeb
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 17 19:15:59 2002 +0000

            Reviewed by Darin.
    
    	- fixed build; WebFileDatabase was importing a file that is internal
    
            * Database.subproj/WebFileDatabase.h: Don't import WebLRUFileList.h.
            * Database.subproj/WebFileDatabase.m: Do import WebLRUFileList.h.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3102 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.h b/WebKit/Misc.subproj/WebFileDatabase.h
index 2e6e295..ea99fbd 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.h
+++ b/WebKit/Misc.subproj/WebFileDatabase.h
@@ -5,11 +5,10 @@
 #import <Foundation/Foundation.h>
 
 #import "WebDatabase.h"
-#import "WebLRUFileList.h"
 
 @interface WebFileDatabase : WebDatabase 
 {
-    WebLRUFileList *lru;
+    struct WebLRUFileList *lru;
     NSMutableArray *ops;
     NSMutableDictionary *setCache;
     NSMutableSet *removeCache;
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index f3cf7aa..e5e1347 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -2,20 +2,21 @@
 	Copyright 2002, Apple, Inc. All rights reserved.
 */
 
-#import <string.h>
+#import "WebFileDatabase.h"
+
 #import <fcntl.h>
+#import <fts.h>
+#import <pthread.h>
+#import <string.h>
 #import <sys/stat.h>
 #import <sys/types.h>
 #import <sys/mman.h>
-#import <pthread.h>
-#import <fts.h>
 
-#import "WebFileDatabase.h"
-#import "WebNSFileManagerExtras.h"
 #import "WebFoundationLogging.h"
+#import "WebLRUFileList.h"
+#import "WebNSFileManagerExtras.h"
 #import "WebSystemBits.h"
 
-
 #if ERROR_DISABLED
 #define BEGIN_EXCEPTION_HANDLER
 #define END_EXCEPTION_HANDLER

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list