[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 fd1e7a4f53e370e72b6007ffa8c6d3160c61c419
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 9 06:25:48 2002 +0000

    WebFoundation:
    
            * Misc.subproj/WebAssertions.h: Use 0 instead of undefined
    	for the XXX_DISABLED macros to be more consistent with the
    	case where they are explicitly defined on purpose.
    
            * CacheLoader.subproj/WebHTTPProtocolHandler.m:
    	Use #if ! rather than #ifndef with LOG_DISABLED, since it
    	is set to 0 rather than not defined when LOG is enabled.
    
            * CacheLoader.subproj/WebResourceLoad.m:
    	Same, but for ERROR, rather than LOG.
    
    WebKit:
    
            * Plugins.subproj/WebPluginStream.m:
            * Plugins.subproj/WebPluginView.m:
    	Use #if ! rather than #ifndef with LOG_DISABLED, since it
    	is set to 0 rather than not defined when LOG is enabled.
    
    WebBrowser:
    
            * BookmarksController.m:
            * GlobalHistory.m:
    	Use #if ! rather than #ifndef with LOG_DISABLED, since it
    	is set to 0 rather than not defined when LOG is enabled.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2002 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d0a931e..a8e0b5d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2002-09-08  Darin Adler  <darin at apple.com>
 
+        * Plugins.subproj/WebPluginStream.m:
+        * Plugins.subproj/WebPluginView.m:
+	Use #if ! rather than #ifndef with LOG_DISABLED, since it
+	is set to 0 rather than not defined when LOG is enabled.
+
+2002-09-08  Darin Adler  <darin at apple.com>
+
         * Bookmarks.subproj/WebBookmarkGroup.m:
         * History.subproj/WebHistoryPrivate.m:
         * History.subproj/WebURLsWithTitles.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d0a931e..a8e0b5d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-09-08  Darin Adler  <darin at apple.com>
 
+        * Plugins.subproj/WebPluginStream.m:
+        * Plugins.subproj/WebPluginView.m:
+	Use #if ! rather than #ifndef with LOG_DISABLED, since it
+	is set to 0 rather than not defined when LOG is enabled.
+
+2002-09-08  Darin Adler  <darin at apple.com>
+
         * Bookmarks.subproj/WebBookmarkGroup.m:
         * History.subproj/WebHistoryPrivate.m:
         * History.subproj/WebURLsWithTitles.m:
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 0437f16..c8e1f82 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -191,7 +191,7 @@
 {
     // Don't report error before we've called NPP_NewStream
     if(!isFirstChunk){
-#ifndef NDEBUG
+#if !LOG_DISABLED
         NPError npErr =
 #endif
         NPP_DestroyStream(instance, &npStream, error);
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index bb0d5ba..4dbee48 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -139,7 +139,7 @@
     if (activate)
         event.modifiers |= activeFlag;
     
-#ifndef NDEBUG
+#if !LOG_DISABLED
     BOOL acceptedEvent =
 #endif
     [self sendEvent:&event]; 
@@ -175,7 +175,7 @@
     [self getCarbonEvent:&event];
     event.what = getFocusEvent;
     
-#ifndef NDEBUG
+#if !LOG_DISABLED
     BOOL acceptedEvent =
 #endif
     [self sendEvent:&event]; 
@@ -191,7 +191,7 @@
     [self getCarbonEvent:&event];
     event.what = loseFocusEvent;
     
-#ifndef NDEBUG
+#if !LOG_DISABLED
     BOOL acceptedEvent =
 #endif
     [self sendEvent:&event]; 
@@ -207,7 +207,7 @@
     [self getCarbonEvent:&event withEvent:theEvent];
     event.what = mouseDown;
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     BOOL acceptedEvent =
 #endif
     [self sendEvent:&event]; 
@@ -222,7 +222,7 @@
     [self getCarbonEvent:&event withEvent:theEvent];
     event.what = mouseUp;
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     BOOL acceptedEvent =
 #endif
     [self sendEvent:&event]; 
@@ -237,7 +237,7 @@
     [self getCarbonEvent:&event withEvent:theEvent];
     event.what = adjustCursorEvent;
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     BOOL acceptedEvent =
 #endif
     [self sendEvent:&event]; 
@@ -252,7 +252,7 @@
     [self getCarbonEvent:&event withEvent:theEvent];
     event.what = adjustCursorEvent;
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     BOOL acceptedEvent =
 #endif
     [self sendEvent:&event]; 
@@ -358,7 +358,7 @@
     EventRecord event;
     
     [self getCarbonEvent:&event withEvent:theEvent];
-#ifndef NDEBUG
+#if !LOG_DISABLED
     BOOL acceptedEvent =
 #endif
     [self sendEvent:&event];
@@ -493,7 +493,7 @@
 {
     [self setUpWindowAndPort];
 
-#ifndef NDEBUG
+#if !LOG_DISABLED
     NPError npErr =
 #endif
     NPP_SetWindow(instance, &window);
@@ -541,7 +541,7 @@
     
     isStarted = YES;
     
-#ifndef NDEBUG
+#if !LOG_DISABLED
     NPError npErr =
 #endif
     NPP_New((char *)[mime cString], instance, fullMode ? NP_FULL : NP_EMBED, argsCount, cAttributes, cValues, NULL);
@@ -618,7 +618,7 @@
     [webFrame release];
     [webDataSource release];
     
-#ifndef NDEBUG
+#if !LOG_DISABLED
     NPError npErr =
 #endif
     NPP_Destroy(instance, NULL);

-- 
WebKit Debian packaging