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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 4c9aa2872c40e67d41a93b43d653cda0051d1d1e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 28 19:02:24 2001 +0000

    *** empty log message ***
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@221 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQFontMetrics.h b/WebCore/kwq/KWQFontMetrics.h
index 69fc51e..5c0ad3e 100644
--- a/WebCore/kwq/KWQFontMetrics.h
+++ b/WebCore/kwq/KWQFontMetrics.h
@@ -79,7 +79,11 @@ public:
 // private ---------------------------------------------------------------------
 #ifdef _KWQ_
     void _initialize();
+#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
     void _initializeWithFont(NSFont *);
+#else
+    void _initializeWithFont(void *);
+#endif
     void _free();
     
     struct KWQFontMetricsData {
diff --git a/WebCore/kwq/KWQPainter.h b/WebCore/kwq/KWQPainter.h
index 7fdd766..fdeace3 100644
--- a/WebCore/kwq/KWQPainter.h
+++ b/WebCore/kwq/KWQPainter.h
@@ -183,7 +183,11 @@ private:
 	QPen qpen;
 	uint isFocusLocked:1;
         void *ps_stack;
+#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
         NSCompositingOperation compositingOperation;
+#else
+        uint compositingOperation;
+#endif
     } *data;
 #endif
 }; // end class QPainter
diff --git a/WebCore/kwq/qt/qfontmetrics.h b/WebCore/kwq/qt/qfontmetrics.h
index 69fc51e..5c0ad3e 100644
--- a/WebCore/kwq/qt/qfontmetrics.h
+++ b/WebCore/kwq/qt/qfontmetrics.h
@@ -79,7 +79,11 @@ public:
 // private ---------------------------------------------------------------------
 #ifdef _KWQ_
     void _initialize();
+#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
     void _initializeWithFont(NSFont *);
+#else
+    void _initializeWithFont(void *);
+#endif
     void _free();
     
     struct KWQFontMetricsData {
diff --git a/WebCore/kwq/qt/qpainter.h b/WebCore/kwq/qt/qpainter.h
index 7fdd766..fdeace3 100644
--- a/WebCore/kwq/qt/qpainter.h
+++ b/WebCore/kwq/qt/qpainter.h
@@ -183,7 +183,11 @@ private:
 	QPen qpen;
 	uint isFocusLocked:1;
         void *ps_stack;
+#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
         NSCompositingOperation compositingOperation;
+#else
+        uint compositingOperation;
+#endif
     } *data;
 #endif
 }; // end class QPainter
diff --git a/WebCore/src/kwq/qt/qfontmetrics.h b/WebCore/src/kwq/qt/qfontmetrics.h
index 69fc51e..5c0ad3e 100644
--- a/WebCore/src/kwq/qt/qfontmetrics.h
+++ b/WebCore/src/kwq/qt/qfontmetrics.h
@@ -79,7 +79,11 @@ public:
 // private ---------------------------------------------------------------------
 #ifdef _KWQ_
     void _initialize();
+#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
     void _initializeWithFont(NSFont *);
+#else
+    void _initializeWithFont(void *);
+#endif
     void _free();
     
     struct KWQFontMetricsData {
diff --git a/WebCore/src/kwq/qt/qpainter.h b/WebCore/src/kwq/qt/qpainter.h
index 7fdd766..fdeace3 100644
--- a/WebCore/src/kwq/qt/qpainter.h
+++ b/WebCore/src/kwq/qt/qpainter.h
@@ -183,7 +183,11 @@ private:
 	QPen qpen;
 	uint isFocusLocked:1;
         void *ps_stack;
+#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
         NSCompositingOperation compositingOperation;
+#else
+        uint compositingOperation;
+#endif
     } *data;
 #endif
 }; // end class QPainter

-- 
WebKit Debian packaging