r17614 by jghali - fix annoying warning from msvc compiler

scribus-commit scribus-commit at lists.scribus.net
Sat Jun 23 16:11:47 UTC 2012


Author: jghali
Date: Sat Jun 23 16:11:47 2012
New Revision: 17614

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17614
Log:
fix annoying warning from msvc compiler

Modified:
    trunk/Scribus/scribus/third_party/cairo/cairoint.h

Modified: trunk/Scribus/scribus/third_party/cairo/cairoint.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17614&path=/trunk/Scribus/scribus/third_party/cairo/cairoint.h
==============================================================================
--- trunk/Scribus/scribus/third_party/cairo/cairoint.h (original)
+++ trunk/Scribus/scribus/third_party/cairo/cairoint.h Sat Jun 23 16:11:47 2012
@@ -60,7 +60,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
 #endif
 #include <math.h>




More information about the scribus-commit mailing list