Bug #: 3826

Submitted by: eseidel
Reviewed by: mjs
        * khtml/rendering/render_canvasimage.cpp: <cmath.h>
        * khtml/rendering/render_image.cpp: <cmath.h> instead of <math.h>
        * kwq/KWQDef.h: 64bit support for KDOM
        (qRound): inline mapping to lround.
        Newer patch, now gcc 3.3 compatible.
        Thanks to ggaren for the 3.3 fix.
        http://bugzilla.opendarwin.org/show_bug.cgi?id=3826

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9608 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 61177ac9b2573e2a274c6e220010a84b3e5368ef..3dedf9b7059cdb7557f029627c0e3432e4036d7d 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2005-07-07  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by mjs.
+
+        * khtml/rendering/render_canvasimage.cpp: <cmath.h>
+        * khtml/rendering/render_image.cpp: <cmath.h> instead of <math.h>
+        * kwq/KWQDef.h: 64bit support for KDOM
+        (qRound): inline mapping to lround.
+        Newer patch, now gcc 3.3 compatible.
+        Thanks to ggaren for the 3.3 fix.
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=3826
+
 2005-07-06  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by mjs.

diff --git a/WebCore/khtml/rendering/render_canvasimage.cpp b/WebCore/khtml/rendering/render_canvasimage.cpp
index bac9dc4d4528b2b26577c9342e93c8a0bce94f48..5cd0b7fc77c3c847699b110b06840abc5771cf1c 100644 (file)
--- a/WebCore/khtml/rendering/render_canvasimage.cpp
+++ b/WebCore/khtml/rendering/render_canvasimage.cpp
@@ -43,7 +43,12 @@
 #include "html/dtd.h"
 #include "xml/dom2_eventsimpl.h"
 #include "html/html_documentimpl.h"
-#include <math.h>
+
+// Must include <cmath> instead of <math.h> because of a bug in the
+// gcc 3.3 library version of <math.h> where if you include both
+// <cmath> and <math.h> the macros necessary for functions like
+// isnan are not defined.
+#include <cmath>
 
 
 

diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index a1ec490ef7481e253438b028778d418f28411e19..43d026a901ceb6329c3f38417dd0424c9ee2c158 100644 (file)
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -43,7 +43,12 @@
 #include "html/dtd.h"
 #include "xml/dom2_eventsimpl.h"
 #include "html/html_documentimpl.h"
-#include <math.h>
+
+// Must include <cmath> instead of <math.h> because of a bug in the
+// gcc 3.3 library version of <math.h> where if you include both
+// <cmath> and <math.h> the macros necessary for functions like
+// isnan are not defined.
+#include <cmath>
 
 using namespace DOM;
 using namespace khtml;

diff --git a/WebCore/kwq/KWQDef.h b/WebCore/kwq/KWQDef.h
index b13b91d6cfa472f93e2eab4fbaff1c6267ceee06..c8f03bcf57d717a36e9f102d0ee0b70b951d27f2 100644 (file)
--- a/WebCore/kwq/KWQDef.h
+++ b/WebCore/kwq/KWQDef.h
@@ -33,6 +33,9 @@ typedef unsigned char uchar;
 typedef unsigned long ulong;
 #endif
 
+typedef int64_t Q_INT64;
+typedef u_int64_t Q_UINT64;
+
 typedef int Q_INT32;
 typedef unsigned int Q_UINT32;
 
@@ -47,6 +50,8 @@ inline const T& kMax ( const T& a, const T& b ) { return b < a ? a : b; }
 
 #define QABS(a) (((a) >= 0) ? (a) : -(a))
 
+inline int qRound(double a) { return lround(a); }
+
 #ifndef TRUE
 #define TRUE 1
 #endif
@@ -59,7 +64,7 @@ void qDebug(const char *msg, ...);
 void qWarning(const char *msg, ...);
 
 /* Silly hack to avoid "unused parameter" warnings */
-#define Q_UNUSED(x) (x)=(x)
+#define Q_UNUSED(x) (void)(x)
 
 #define Q_ASSERT(arg) do {} while(0)