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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 1f4321ff6bc37c1612de079b797b45c0fe365b5b
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 14 08:23:09 2002 +0000

            * khtml/ecma/kjs_window.cpp: Fix to build clean after
    	JavaScriptCore live class changes (this way of handling it is kind
    	of a hack, but kjs is unhappy to have Boolean defined so it can't
    	unconditionally include CoreFoundation.h in collector.h; will fix
    	better later).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1812 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index fea3b33..e181722 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-08-14  Maciej Stachowiak  <mjs at apple.com>
+
+        * khtml/ecma/kjs_window.cpp: Fix to build clean after
+	JavaScriptCore live class changes (this way of handling it is kind
+	of a hack, but kjs is unhappy to have Boolean defined so it can't
+	unconditionally include CoreFoundation.h in collector.h; will fix
+	better later).
+
 2002-08-13  Maciej Stachowiak  <mjs at apple.com>
 
 	Add the ability to determine the classes of live JavaScript
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index fea3b33..e181722 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-08-14  Maciej Stachowiak  <mjs at apple.com>
+
+        * khtml/ecma/kjs_window.cpp: Fix to build clean after
+	JavaScriptCore live class changes (this way of handling it is kind
+	of a hack, but kjs is unhappy to have Boolean defined so it can't
+	unconditionally include CoreFoundation.h in collector.h; will fix
+	better later).
+
 2002-08-13  Maciej Stachowiak  <mjs at apple.com>
 
 	Add the ability to determine the classes of live JavaScript
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fea3b33..e181722 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-08-14  Maciej Stachowiak  <mjs at apple.com>
+
+        * khtml/ecma/kjs_window.cpp: Fix to build clean after
+	JavaScriptCore live class changes (this way of handling it is kind
+	of a hack, but kjs is unhappy to have Boolean defined so it can't
+	unconditionally include CoreFoundation.h in collector.h; will fix
+	better later).
+
 2002-08-13  Maciej Stachowiak  <mjs at apple.com>
 
 	Add the ability to determine the classes of live JavaScript
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 00ee4df..a874a1c 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -33,6 +33,9 @@
 #include <assert.h>
 #include <qstyle.h>
 
+#if APPLE_CHANGES
+#define _COLLECTOR
+#endif
 #include <kjs/collector.h>
 #include "kjs_proxy.h"
 #include "kjs_window.h"

-- 
WebKit Debian packaging