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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit 6d60b060d730b14405316ba15e9c0fbfdc1198a0
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 15 19:26:53 2001 +0000

    Added partially implemented log and did some tweaking
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@327 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/kwqdebug.h b/WebCore/kwq/kwqdebug.h
index bfe214c..b833bf0 100644
--- a/WebCore/kwq/kwqdebug.h
+++ b/WebCore/kwq/kwqdebug.h
@@ -22,7 +22,26 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
- 
-#define _logNeverImplemented()   NSLog (@"ERROR %s:%d  %s (NOT IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__)
-#define _logNotYetImplemented()   NSLog (@"WARNING %s:%d  %s (NOT YET IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__)
 
+#ifndef KWQDEBUG_H_
+#define KWQDEBUG_H_
+
+#define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
+#include <Foundation/Foundation.h>
+#undef Fixed
+#undef Rect
+#undef Boolean
+
+#define _logNeverImplemented() \
+        NSLog(@"ERROR %s:%d  %s (NOT IMPLEMENTED)\n", __FILE__, __LINE__, \
+                __FUNCTION__)
+#define _logPartiallyImplemented() \
+        NSLog(@"ERROR %s:%d  %s (PARTIALLY IMPLEMENTED)\n", __FILE__, \
+                __LINE__, __FUNCTION__)
+#define _logNotYetImplemented() \
+        NSLog (@"WARNING %s:%d  %s (NOT YET IMPLEMENTED)\n", __FILE__, \
+                __LINE__, __FUNCTION__)
+
+#endif
diff --git a/WebCore/kwq/kwqdebug.mm b/WebCore/kwq/kwqdebug.mm
index 491888b..04cf569 100644
--- a/WebCore/kwq/kwqdebug.mm
+++ b/WebCore/kwq/kwqdebug.mm
@@ -22,6 +22,5 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
- #import <Cocoa/Cocoa.h>
 
 #include <kwqdebug.h>
diff --git a/WebCore/src/kwq/kwqdebug.h b/WebCore/src/kwq/kwqdebug.h
index bfe214c..b833bf0 100644
--- a/WebCore/src/kwq/kwqdebug.h
+++ b/WebCore/src/kwq/kwqdebug.h
@@ -22,7 +22,26 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
- 
-#define _logNeverImplemented()   NSLog (@"ERROR %s:%d  %s (NOT IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__)
-#define _logNotYetImplemented()   NSLog (@"WARNING %s:%d  %s (NOT YET IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__)
 
+#ifndef KWQDEBUG_H_
+#define KWQDEBUG_H_
+
+#define Fixed MacFixed
+#define Rect MacRect
+#define Boolean MacBoolean
+#include <Foundation/Foundation.h>
+#undef Fixed
+#undef Rect
+#undef Boolean
+
+#define _logNeverImplemented() \
+        NSLog(@"ERROR %s:%d  %s (NOT IMPLEMENTED)\n", __FILE__, __LINE__, \
+                __FUNCTION__)
+#define _logPartiallyImplemented() \
+        NSLog(@"ERROR %s:%d  %s (PARTIALLY IMPLEMENTED)\n", __FILE__, \
+                __LINE__, __FUNCTION__)
+#define _logNotYetImplemented() \
+        NSLog (@"WARNING %s:%d  %s (NOT YET IMPLEMENTED)\n", __FILE__, \
+                __LINE__, __FUNCTION__)
+
+#endif
diff --git a/WebCore/src/kwq/kwqdebug.mm b/WebCore/src/kwq/kwqdebug.mm
index 491888b..04cf569 100644
--- a/WebCore/src/kwq/kwqdebug.mm
+++ b/WebCore/src/kwq/kwqdebug.mm
@@ -22,6 +22,5 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
- #import <Cocoa/Cocoa.h>
 
 #include <kwqdebug.h>

-- 
WebKit Debian packaging