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
+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.
#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>
#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;
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;
#define QABS(a) (((a) >= 0) ? (a) : -(a))
+inline int qRound(double a) { return lround(a); }
+
#ifndef TRUE
#define TRUE 1
#endif
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)