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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:17:55 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 92ecf2efd16b16732391c2043c7face280107f30
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 10 20:45:19 2002 +0000

    	* khtml/css/cssstyleselector.cpp: Fix uninitialized variable warning.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 30f04b8..49d0726 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,9 @@
 2002-06-10  Darin Adler  <darin at apple.com>
 
+	* khtml/css/cssstyleselector.cpp: Fix uninitialized variable warning.
+
+2002-06-10  Darin Adler  <darin at apple.com>
+
 	Merged in changes from KDE 3.0.1.
 
 	* kwq/kdecore/kurl.h:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 30f04b8..49d0726 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,9 @@
 2002-06-10  Darin Adler  <darin at apple.com>
 
+	* khtml/css/cssstyleselector.cpp: Fix uninitialized variable warning.
+
+2002-06-10  Darin Adler  <darin at apple.com>
+
 	Merged in changes from KDE 3.0.1.
 
 	* kwq/kdecore/kurl.h:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 30f04b8..49d0726 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,9 @@
 2002-06-10  Darin Adler  <darin at apple.com>
 
+	* khtml/css/cssstyleselector.cpp: Fix uninitialized variable warning.
+
+2002-06-10  Darin Adler  <darin at apple.com>
+
 	Merged in changes from KDE 3.0.1.
 
 	* kwq/kdecore/kurl.h:
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 26ab2c0..ed020c8 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -268,7 +268,11 @@ static inline void bubbleSort( CSSOrderedProperty **b, CSSOrderedProperty **e )
 	bool swapped = FALSE;
         CSSOrderedProperty **y = e+1;
 	CSSOrderedProperty **x = e;
+#ifdef APPLE_CHANGES
+        CSSOrderedProperty **swappedPos = 0; // quiet gcc warning
+#else
         CSSOrderedProperty **swappedPos;
+#endif
 	do {
 	    if ( !((**(--x)) < (**(--y))) ) {
 		swapped = TRUE;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list