Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 54e0aaa5be00017ab644bbad49fec90380896236..e0f5dda1a2d93a34a3a06b4834b60954a6fa4dbb 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -172,7 +172,8 @@ char const *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION;
    unpredictable places. To get around this, we tell the x87 FPU to use only
    double precision. Note that this is not needed for x86_64 because that uses
    the SSE unit by default instead of the x87 FPU. */
-#if (defined(__x86__) || defined(__i386__)) && defined(HAVE_FPU_CONTROL_H)
+#if ((defined(__x86__) || defined(__i386__)) \
+  && defined(HAVE_FPU_CONTROL_H) && (HAVE_FPU_CONTROL_H == 1))
 
 #include <fpu_control.h>
 static void configure_fpu() {