summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-07-08 15:02:23 (GMT)
committerVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-07-08 15:06:29 (GMT)
commitb358143b7eb5dc3d76a09e501914fa00d0c3876c (patch)
tree667cbc611126753d90ef533853dfe0e4ac3abfe4 /src/corelib
parentcf7ca87e057ef3810c5db36ff975a98f532a8dc0 (diff)
downloadQt-b358143b7eb5dc3d76a09e501914fa00d0c3876c.zip
Qt-b358143b7eb5dc3d76a09e501914fa00d0c3876c.tar.gz
Qt-b358143b7eb5dc3d76a09e501914fa00d0c3876c.tar.bz2
Define M_PI in qmath.h if not defined by math.h (as is the case on Windows), and remove duplicate defines elsewhere.
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/kernel/qmath.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmath.h b/src/corelib/kernel/qmath.h
index 348957f..7a77d56 100644
--- a/src/corelib/kernel/qmath.h
+++ b/src/corelib/kernel/qmath.h
@@ -132,6 +132,10 @@ inline qreal qPow(qreal x, qreal y)
return pow(x, y);
}
+#ifndef M_PI
+#define M_PI (3.14159265358979323846)
+#endif
+
QT_END_NAMESPACE
QT_END_HEADER