[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 734c8e9088747ca1492eab2c8707db0f4dcc00e0
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 22 21:55:41 2004 +0000

    	Fixed build snafu (re-declaration of NPBool in npruntime.h and
    	npapi.h).
    
            * bindings/npruntime.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6460 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 6961f87..4aac867 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
 2004-04-22  Richard Williamson   <rjw at apple.com>
 
+	Fixed build snafu (re-declaration of NPBool in npruntime.h and
+	npapi.h).
+
+        * bindings/npruntime.h:
+
+2004-04-22  Richard Williamson   <rjw at apple.com>
+
 	Updated plugin binding API to reflect latest revision from
 	working group.
 	
diff --git a/JavaScriptCore/bindings/npruntime.h b/JavaScriptCore/bindings/npruntime.h
index e82b38d..440df3a 100644
--- a/JavaScriptCore/bindings/npruntime.h
+++ b/JavaScriptCore/bindings/npruntime.h
@@ -103,7 +103,10 @@ typedef struct _NPString {
     uint32_t UTF8Length;
 } NPString;
 
+#ifndef _NPAPI_H_
+// Ack!  Temporary hack to get build working.
 typedef unsigned char NPBool;
+#endif
   
 typedef enum {
     NPVariantVoidType,

-- 
WebKit Debian packaging