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

kocienda kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:48:10 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit d361040b29b847fe0a43a05ad6c9a86590b43a7e
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 1 15:11:47 2001 +0000

    Modified to support switchable borrowing of implementation
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@235 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQStrList.h b/WebCore/kwq/KWQStrList.h
index 69c5eb5..f2dead5 100644
--- a/WebCore/kwq/KWQStrList.h
+++ b/WebCore/kwq/KWQStrList.h
@@ -30,6 +30,8 @@
 #include <config.h>
 #endif
 
+#ifndef USING_BORROWED_QSTRINGLIST
+
 #include <qstring.h>
 #include <qlist.h>
 
@@ -61,4 +63,7 @@ public:
 
 }; // class QStrList ===========================================================
 
+#else // USING_BORROWED_QSTRINGLIST
+// This will help to keep the linker from complaining about empty archives
+void KWQStrList_Dummy() {}
 #endif
diff --git a/WebCore/src/kwq/KWQStrList.h b/WebCore/src/kwq/KWQStrList.h
index 69c5eb5..f2dead5 100644
--- a/WebCore/src/kwq/KWQStrList.h
+++ b/WebCore/src/kwq/KWQStrList.h
@@ -30,6 +30,8 @@
 #include <config.h>
 #endif
 
+#ifndef USING_BORROWED_QSTRINGLIST
+
 #include <qstring.h>
 #include <qlist.h>
 
@@ -61,4 +63,7 @@ public:
 
 }; // class QStrList ===========================================================
 
+#else // USING_BORROWED_QSTRINGLIST
+// This will help to keep the linker from complaining about empty archives
+void KWQStrList_Dummy() {}
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list