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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 83d25d29efa345316d74f5af706765171e7270a0
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 1 02:10:46 2004 +0000

    More header shuffling.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6294 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 1e7f9eb..f690f87 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -255,6 +255,7 @@
 				5182A53D06012C3000CBD2F2,
 				517BE7F50610E39600221947,
 				5199B1C0061B65BC0070C006,
+				5199B266061BB1300070C006,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -788,6 +789,7 @@
 		};
 		51856D950562EE9C008B9D83 = {
 			children = (
+				5199B265061BB1300070C006,
 				5199B1BD061B65BC0070C006,
 				5199B1BE061B65BC0070C006,
 				5182A53A06012C3000CBD2F2,
@@ -926,6 +928,21 @@
 			settings = {
 			};
 		};
+		5199B265061BB1300070C006 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			name = npsap.h;
+			path = bindings/npsap.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		5199B266061BB1300070C006 = {
+			fileRef = 5199B265061BB1300070C006;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		51A58A8D057D3A6A00A3E942 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
diff --git a/JavaScriptCore/bindings/npsap.h b/JavaScriptCore/bindings/npsap.h
index 5970ca9..e70a516 100644
--- a/JavaScriptCore/bindings/npsap.h
+++ b/JavaScriptCore/bindings/npsap.h
@@ -28,20 +28,20 @@
 #include <npruntime.h>
 
 /*
-	NPP_GetNativeObjectForJavaScript allows user agents to retrieve a plugin's exported
+	NPP_GetNativeObjectForScript allows user agents to retrieve a plugin's exported
 	interface.
 */
-typedef NPObject *(*NPP_GetNativeObjectForScript) (NPP instance);
+NPObject *(*NPP_GetNativeObjectForScript) (NPP instance);
 
 /*
 	Get the window object for the page that contains the plugin.
 */
-typedef NPScriptObject *(*NPN_GetWindowScriptObject) (NPP instance);
+NPScriptObject *(*NPN_GetWindowScriptObject) (NPP instance);
 
 /*
-	Get the JavaScript DOM object that refers to the plugin.
+	Get the script DOM object that refers to the plugin.
 */
-typedef NPScriptObject *(*NPN_GetInstanceScriptObject) (NPP instance);
+NPScriptObject *(*NPN_GetInstanceScriptObject) (NPP instance);
 
 #endif
 
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index b94a0d5..b57572c 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -519,7 +519,6 @@
 				BE9185E205EE59B80081354D,
 				BE94EB6605EFFE6B0032DCB5,
 				BE94EB6705EFFE6B0032DCB5,
-				515B877605F5332F00EABBF9,
 				BE9970C305F7DD1C00611115,
 				BEF7EEA205FF8F0D009717EE,
 				932127560606724900B62302,
@@ -909,20 +908,6 @@
 //512
 //513
 //514
-		515B877505F5332F00EABBF9 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = NP_SAP.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		515B877605F5332F00EABBF9 = {
-			fileRef = 515B877505F5332F00EABBF9;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		517FA6B20370BD6100CA2D3A = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -4732,7 +4717,6 @@
 		};
 		F523D23402DE436B018635CA = {
 			children = (
-				515B877505F5332F00EABBF9,
 				F523D1F402DE4369018635CA,
 				F523D1F502DE4369018635CA,
 				F523D1F602DE4369018635CA,

-- 
WebKit Debian packaging