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

[darin]

The following commit has been merged in the debian/unstable branch:
commit ad830e72632b1485b63cb799623830625b1fd136
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 28 20:38:15 2002 +0000

    	Give the next fat build a better chance of working with the
    	new gcc without turning warnings off.
    
            * khtml/css/cssparser.cpp: Use a macro to disable inlining.
            * khtml/html/htmltokenizer.cpp: Ditto.
            * khtml/misc/htmlhashes.cpp: Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2200 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5751d1a..6542e75 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-09-28  Darin Adler  <darin at apple.com>
 
+	Give the next fat build a better chance of working with the
+	new gcc without turning warnings off.
+
+        * khtml/css/cssparser.cpp: Use a macro to disable inlining.
+        * khtml/html/htmltokenizer.cpp: Ditto.
+        * khtml/misc/htmlhashes.cpp: Ditto.
+
+2002-09-28  Darin Adler  <darin at apple.com>
+
 	- fixed 3022441 -- scroll bar is missing in window created with window.open
 
         * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): The checks for extra
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5751d1a..6542e75 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-09-28  Darin Adler  <darin at apple.com>
 
+	Give the next fat build a better chance of working with the
+	new gcc without turning warnings off.
+
+        * khtml/css/cssparser.cpp: Use a macro to disable inlining.
+        * khtml/html/htmltokenizer.cpp: Ditto.
+        * khtml/misc/htmlhashes.cpp: Ditto.
+
+2002-09-28  Darin Adler  <darin at apple.com>
+
 	- fixed 3022441 -- scroll bar is missing in window created with window.open
 
         * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): The checks for extra
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5751d1a..6542e75 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-09-28  Darin Adler  <darin at apple.com>
 
+	Give the next fat build a better chance of working with the
+	new gcc without turning warnings off.
+
+        * khtml/css/cssparser.cpp: Use a macro to disable inlining.
+        * khtml/html/htmltokenizer.cpp: Ditto.
+        * khtml/misc/htmlhashes.cpp: Ditto.
+
+2002-09-28  Darin Adler  <darin at apple.com>
+
 	- fixed 3022441 -- scroll bar is missing in window created with window.open
 
         * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): The checks for extra
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 199b9cb..29f7e11 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -53,6 +53,9 @@ using namespace DOM;
 #include "misc/htmlhashes.h"
 #include "misc/helper.h"
 
+// turn off inlining to void warning with newer gcc
+#undef __inline
+#define __inline
 //
 // The following file defines the function
 //     const struct props *findProp(const char *word, int len)
@@ -61,7 +64,7 @@ using namespace DOM;
 // (and including) CSS_PROP_TOTAL-1
 #include "cssproperties.c"
 #include "cssvalues.c"
-
+#undef __inline
 
 static QPtrList<CSSProperty>* m_propList = 0;
 static bool m_bImportant = FALSE;
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index a340945..81fc804 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -56,7 +56,11 @@
 #include <kdebug.h>
 #include <stdlib.h>
 
+// turn off inlining to void warning with newer gcc
+#undef __inline
+#define __inline
 #include "kentities.c"
+#undef __inline
 
 using namespace khtml;
 
diff --git a/WebCore/khtml/misc/htmlhashes.cpp b/WebCore/khtml/misc/htmlhashes.cpp
index 7a871c5..ae3a5d5 100644
--- a/WebCore/khtml/misc/htmlhashes.cpp
+++ b/WebCore/khtml/misc/htmlhashes.cpp
@@ -18,9 +18,15 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
+
 #include "htmlhashes.h"
+
+// turn off inlining to void warning with newer gcc
+#undef __inline
+#define __inline
 #include "htmltags.c"
 #include "htmlattrs.c"
+#undef __inline
 
 int khtml::getTagID(const char *tagStr, int len)
 {

-- 
WebKit Debian packaging