[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 cc1718872287861d2cf67ff0bbd15d69d26e5a67
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 27 04:29:44 2003 +0000

            * JavaScriptCorePrefix.h: Added a C case to the NULL definition since we use C as well
            as C++ in this project.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5266 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index cfa8fdf..fc6ac53 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,10 @@
 2003-10-26  Darin Adler  <darin at apple.com>
 
+        * JavaScriptCorePrefix.h: Added a C case to the NULL definition since we use C as well
+        as C++ in this project.
+
+2003-10-26  Darin Adler  <darin at apple.com>
+
         - rolled in some CString changes Harri Porten did on the KDE side
 
         * kjs/ustring.cpp:
diff --git a/JavaScriptCore/JavaScriptCorePrefix.h b/JavaScriptCore/JavaScriptCorePrefix.h
index 4c593a5..6c0e71f 100644
--- a/JavaScriptCore/JavaScriptCorePrefix.h
+++ b/JavaScriptCore/JavaScriptCorePrefix.h
@@ -1,5 +1,7 @@
 #ifdef __cplusplus
 #define NULL __null
+#else
+#define NULL ((void *)0)
 #endif
 
 #include <config.h>

-- 
WebKit Debian packaging