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

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


The following commit has been merged in the debian/unstable branch:
commit d0f5e57b97f81e014cf16790e44bc9b30d83359f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 3 01:37:45 2001 +0000

    This file now references out KWQKHTMLPart header.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index c686bf2..a94704d 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -21,6 +21,10 @@
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef ORIGINAL_KHTMLPART_HEADER
+#include "../../kwq/KWQKHTMLPart.h"
+#else 
+
 #ifndef __khtml_part_h__
 #define __khtml_part_h__
 
@@ -1045,3 +1049,5 @@ private:
 
 
 #endif
+
+#endif
diff --git a/WebCore/src/kdelibs/khtml/khtml_part.h b/WebCore/src/kdelibs/khtml/khtml_part.h
index c686bf2..a94704d 100644
--- a/WebCore/src/kdelibs/khtml/khtml_part.h
+++ b/WebCore/src/kdelibs/khtml/khtml_part.h
@@ -21,6 +21,10 @@
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef ORIGINAL_KHTMLPART_HEADER
+#include "../../kwq/KWQKHTMLPart.h"
+#else 
+
 #ifndef __khtml_part_h__
 #define __khtml_part_h__
 
@@ -1045,3 +1049,5 @@ private:
 
 
 #endif
+
+#endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list