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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit d35dad57537aea549a7f91319603ff1a79362a0a
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 11 19:12:27 2003 +0000

            Reviewed and C++ heavy-lifting by Darin
    
    	Fix warnings in C++ files.
    
            * WebCoreSupport.subproj/WebKeyGeneration.cpp:
            (signedPublicKeyAndChallengeString): Add cast to remove warning.
            (addCertificatesToKeychainFromData): Add cast to remove warning.
            * WebKit.pbproj/project.pbxproj: Add back warnings to C++ files.
            * WebKitPrefix.h: Add define for NULL that works for C++.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5763 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ab254fb..6929925 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-12-11  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed and C++ heavy-lifting by Darin
+
+	Fix warnings in C++ files.
+
+        * WebCoreSupport.subproj/WebKeyGeneration.cpp:
+        (signedPublicKeyAndChallengeString): Add cast to remove warning.
+        (addCertificatesToKeychainFromData): Add cast to remove warning.
+        * WebKit.pbproj/project.pbxproj: Add back warnings to C++ files.
+        * WebKitPrefix.h: Add define for NULL that works for C++.
+
 2003-12-09  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin
diff --git a/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp b/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp
index aa7753c..f6ae685 100644
--- a/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp
+++ b/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp
@@ -381,7 +381,7 @@ errOut:
     if (privKey) {
         CFRelease(privKey);
     }
-    return spkcB64;
+    return reinterpret_cast<char *>(spkcB64);
 }
 
 /* 
@@ -462,7 +462,7 @@ bool addCertificatesToKeychainFromData(const void *bytes, unsigned length)
          * a cert. FIXME: Netscape spec says the blob might also be PKCS7
          * format, which we're not handling here.
          */
-        result = addCertificateToKeychainFromData(bytes, length, 0); 
+        result = addCertificateToKeychainFromData(static_cast<const unsigned char *>(bytes), length, 0); 
     }
 
     return result;
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index c59a204..18e2aea 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -174,7 +174,7 @@
 				SECTORDER_FLAGS = "-sectorder __TEXT __text /AppleInternal/OrderFiles/WebKit.order";
 				USE_GCC3_PFE_SUPPORT = YES;
 				WARNING_CFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wbad-function-cast -Wmissing-declarations -Wnested-externs";
-				WARNING_CPLUSPLUSFLAGS = "-Wno-error";
+				WARNING_CPLUSPLUSFLAGS = "-Werror -Wall -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
 				WRAPPER_EXTENSION = framework;
 			};
 			dependencies = (
diff --git a/WebKit/WebKitPrefix.h b/WebKit/WebKitPrefix.h
index 3ecbe12..6315374 100644
--- a/WebKit/WebKitPrefix.h
+++ b/WebKit/WebKitPrefix.h
@@ -1,4 +1,8 @@
+#ifdef __cplusplus
+#define NULL __null
+#else
 #define NULL ((void *)0)
+#endif
 
 #import <stddef.h>
 #import <stdio.h>

-- 
WebKit Debian packaging