[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 fc91b7c39122f3ed1f611d7aeec8773d79009b78
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 11 23:23:14 2002 +0000

    WebFoundation:
    
            * Misc.subproj/WebAssertions.h: Changed assertions to use a different
    	technique for varargs, which seems to work better on Claudius. Sorry about
            the nearly-full build.
    
            * CacheLoader.subproj/WebResourceRequest.m:
            (-[WebResourceRequest setMethod:]): Store a copy so we don't end up
    	retaining a mutable string that the caller then modifies.
            (-[WebResourceRequest setHeaders:]): Allow nil for theHeaders, and make
    	an empty dictionary in that case.
            (-[WebResourceRequest setHeader:forKey:]): Store a copy so we don't
    	end up putting a reference to a mutable string in our dictionary.
            (-[WebResourceRequest addHeader:forKey:]): Ditto.
            (-[WebResourceRequest setExtraCookies:]): Ditto, same applies for NSArray.
            (-[WebResourceRequest setData:]): Ditto, same for NSData.
    
    WebCore:
    
            * kwq/KWQAssertions.h: Updated copy of the assertions macros (made by script).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2041 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a55418a..359582d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,9 @@
 2002-09-11  Darin Adler  <darin at apple.com>
 
+        * kwq/KWQAssertions.h: Updated copy of the assertions macros (made by script).
+
+2002-09-11  Darin Adler  <darin at apple.com>
+
 	- fixed 3047552 -- crash using CFNotification calls on an NSNotification
 
         * kwq/KWQWindowWidget.mm:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a55418a..359582d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,9 @@
 2002-09-11  Darin Adler  <darin at apple.com>
 
+        * kwq/KWQAssertions.h: Updated copy of the assertions macros (made by script).
+
+2002-09-11  Darin Adler  <darin at apple.com>
+
 	- fixed 3047552 -- crash using CFNotification calls on an NSNotification
 
         * kwq/KWQWindowWidget.mm:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a55418a..359582d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,9 @@
 2002-09-11  Darin Adler  <darin at apple.com>
 
+        * kwq/KWQAssertions.h: Updated copy of the assertions macros (made by script).
+
+2002-09-11  Darin Adler  <darin at apple.com>
+
 	- fixed 3047552 -- crash using CFNotification calls on an NSNotification
 
         * kwq/KWQWindowWidget.mm:
diff --git a/WebCore/kwq/KWQAssertions.h b/WebCore/kwq/KWQAssertions.h
index 125ea5b..187c55a 100644
--- a/WebCore/kwq/KWQAssertions.h
+++ b/WebCore/kwq/KWQAssertions.h
@@ -30,27 +30,29 @@
 // Defining any of the symbols explicitly prevents this from having any effect.
 
 #ifdef NDEBUG
+#define KWQ_ASSERTIONS_DISABLED_DEFAULT 1
+#else
+#define KWQ_ASSERTIONS_DISABLED_DEFAULT 0
+#endif
 
 #ifndef ASSERT_DISABLED
-#define ASSERT_DISABLED 1
+#define ASSERT_DISABLED KWQ_ASSERTIONS_DISABLED_DEFAULT
 #endif
 
 #ifndef ASSERT_ARG_DISABLED
-#define ASSERT_ARG_DISABLED 1
+#define ASSERT_ARG_DISABLED KWQ_ASSERTIONS_DISABLED_DEFAULT
 #endif
 
 #ifndef FATAL_DISABLED
-#define FATAL_DISABLED 1
+#define FATAL_DISABLED KWQ_ASSERTIONS_DISABLED_DEFAULT
 #endif
 
 #ifndef ERROR_DISABLED
-#define ERROR_DISABLED 1
+#define ERROR_DISABLED KWQ_ASSERTIONS_DISABLED_DEFAULT
 #endif
 
 #ifndef LOG_DISABLED
-#define LOG_DISABLED 1
-#endif
-
+#define LOG_DISABLED KWQ_ASSERTIONS_DISABLED_DEFAULT
 #endif
 
 // These helper functions are always declared, but not necessarily always defined if the corresponding function is disabled.
@@ -81,7 +83,7 @@ void KWQLog(const char *file, int line, const char *function, KWQLogChannel *cha
 #if ASSERT_DISABLED
 
 #define ASSERT(assertion) ((void)0)
-#define ASSERT_WITH_MESSAGE(assertion, format, args...) ((void)0)
+#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs...) ((void)0)
 #define ASSERT_NOT_REACHED() ((void)0)
 
 #else
@@ -92,9 +94,9 @@ void KWQLog(const char *file, int line, const char *function, KWQLogChannel *cha
         raise(SIGQUIT); \
     } \
 while (0)
-#define ASSERT_WITH_MESSAGE(assertion, format, args...) do \
+#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs...) do \
     if (!(assertion)) { \
-        KWQReportAssertionFailureWithMessage(__FILE__, __LINE__, __PRETTY_FUNCTION__, #assertion, format, ## args); \
+        KWQReportAssertionFailureWithMessage(__FILE__, __LINE__, __PRETTY_FUNCTION__, #assertion, formatAndArgs); \
         raise(SIGQUIT); \
     } \
 while (0)
@@ -125,10 +127,10 @@ while (0)
 // FATAL
 
 #if FATAL_DISABLED
-#define FATAL(format, args...) ((void)0)
+#define FATAL(formatAndArgs...) ((void)0)
 #else
-#define FATAL(format, args...) do { \
-    KWQReportFatalError(__FILE__, __LINE__, __PRETTY_FUNCTION__, (format), ## args); \
+#define FATAL(formatAndArgs...) do { \
+    KWQReportFatalError(__FILE__, __LINE__, __PRETTY_FUNCTION__, formatAndArgs); \
     raise(SIGQUIT); \
 } while (0)
 #endif
@@ -136,17 +138,17 @@ while (0)
 // ERROR
 
 #if ERROR_DISABLED
-#define ERROR(format, args...) ((void)0)
+#define ERROR(formatAndArgs...) ((void)0)
 #else
-#define ERROR(format, args...) KWQReportError(__FILE__, __LINE__, __PRETTY_FUNCTION__, (format), ## args)
+#define ERROR(formatAndArgs...) KWQReportError(__FILE__, __LINE__, __PRETTY_FUNCTION__, formatAndArgs)
 #endif
 
 // LOG
 
 #if LOG_DISABLED
-#define LOG(channel, format, args...) ((void)0)
+#define LOG(channel, formatAndArgs...) ((void)0)
 #else
-#define LOG(channel, format, args...) KWQLog(__FILE__, __LINE__, __PRETTY_FUNCTION__, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), (format), ## args)
+#define LOG(channel, formatAndArgs...) KWQLog(__FILE__, __LINE__, __PRETTY_FUNCTION__, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), formatAndArgs)
 #define JOIN_LOG_CHANNEL_WITH_PREFIX(prefix, channel) JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel)
 #define JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel) prefix ## channel
 #endif

-- 
WebKit Debian packaging