small diff

Dirk Mueller mueller at kde.org
Sat Apr 19 02:04:59 CEST 2003


Hi, 

please do me a favor and merge this diff.

Thanks. 



-- 
Dirk
-------------- next part --------------
diff -Nur WebCore-orig/khtml/css/cssparser.cpp WebCore/khtml/css/cssparser.cpp
--- WebCore-orig/khtml/css/cssparser.cpp	2003-04-02 22:38:37.000000000 +0200
+++ WebCore/khtml/css/cssparser.cpp	2003-04-18 23:12:22.000000000 +0200
@@ -40,10 +40,6 @@
 
 #include <stdlib.h>
 
-#if APPLE_CHANGES
-void qFatal ( const char * msg ) {}
-#endif
-
 ValueList::ValueList()
 {
     values = (Value *) malloc( 16 * sizeof ( Value ) );
diff -Nur WebCore-orig/kwq/KWQDef.h WebCore/kwq/KWQDef.h
--- WebCore-orig/kwq/KWQDef.h	1970-01-13 07:41:12.000000000 +0100
+++ WebCore/kwq/KWQDef.h	2003-04-18 23:17:57.000000000 +0200
@@ -54,6 +54,7 @@
 
 void qDebug(const char *msg, ...);
 void qWarning(const char *msg, ...);
+void qFatal(const char *msg, ... );
 
 /* Silly hack to avoid "unused parameter" warnings */
 #define Q_UNUSED(x) (x)=(x)
diff -Nur WebCore-orig/kwq/KWQGlobal.mm WebCore/kwq/KWQGlobal.mm
--- WebCore-orig/kwq/KWQGlobal.mm	1970-01-13 07:41:13.000000000 +0100
+++ WebCore/kwq/KWQGlobal.mm	2003-04-18 23:09:52.000000000 +0200
@@ -31,3 +31,6 @@
 {
 }
 
+void qFatal(const char* msg, ...)
+{
+}


More information about the Khtml-devel mailing list