summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2011-02-08 11:45:00 +0000
committervlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2011-02-08 11:45:00 +0000
commit24825556f38560963fbaaee3eb2e0f3e5e0c0596 (patch)
tree765057c6b6ae91906f66216390d23f8b9882667e
parent3bdf22caf461ebe8447e2caebe09f6c2e23a614e (diff)
downloadmpfr-24825556f38560963fbaaee3eb2e0f3e5e0c0596.tar.gz
[mpfr-impl.h] Fix for Intel's compiler (ICC) under MS Windows:
MPFR was incorrectly assuming that ICC had some extensions like under GNU/Linux. This made the MPFR compilation fail. [Changeset r7453 merged from the trunk] git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/branches/3.0@7454 280ebfd0-de03-0410-8827-d642c229c3f4
-rw-r--r--mpfr-impl.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/mpfr-impl.h b/mpfr-impl.h
index 1417182c4..88ece6639 100644
--- a/mpfr-impl.h
+++ b/mpfr-impl.h
@@ -116,7 +116,12 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
# define __MPFR_STDC(version) 0
#endif
-#if defined(__ICC)
+#if defined(_WIN32)
+/* Under MS Windows (e.g. with VS2008 or VS2010), Intel's compiler doesn't
+ support/enable extensions like the ones seen under GNU/Linux.
+ http://websympa.loria.fr/wwsympa/arc/mpfr/2011-02/msg00032.html */
+# define __MPFR_ICC(a,b,c) 0
+#elif defined(__ICC)
# define __MPFR_ICC(a,b,c) (__ICC >= (a)*100+(b)*10+(c))
#elif defined(__INTEL_COMPILER)
# define __MPFR_ICC(a,b,c) (__INTEL_COMPILER >= (a)*100+(b)*10+(c))