Mercurial > hg > sv-dependency-builds

diff osx/include/fftw3.h @ 118:a8541380d3e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ah, we've already done this. Merge, taking everything from the branch with the older commits.
author Chris Cannam <cannam@all-day-breakfast.com>
date Fri, 04 Jul 2014 10:37:37 +0100
parents 585a7be09763 241db1b1eff2
children
line wrap: on
line diff
--- a/osx/include/fftw3.h	Fri Jul 04 10:36:59 2014 +0100
+++ b/osx/include/fftw3.h	Fri Jul 04 10:37:37 2014 +0100
@@ -357,7 +357,6 @@
 /* __float128 (quad precision) is a gcc extension on i386, x86_64, and ia64
    for gcc >= 4.6 (compiled in FFTW with --enable-quad-precision) */
 #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) \
- && !(defined(__ICC) || defined(__INTEL_COMPILER)) \
  && (defined(__i386__) || defined(__x86_64__) || defined(__ia64__))
 #  if !defined(FFTW_NO_Complex) && defined(_Complex_I) && defined(complex) && defined(I)
 /* note: __float128 is a typedef, which is not supported with the _Complex
@@ -385,7 +384,6 @@
 #define FFTW_PRESERVE_INPUT (1U << 4) /* cancels FFTW_DESTROY_INPUT */
 #define FFTW_PATIENT (1U << 5) /* IMPATIENT is default */
 #define FFTW_ESTIMATE (1U << 6)
-#define FFTW_WISDOM_ONLY (1U << 21)
 
 /* undocumented beyond-guru flags */
 #define FFTW_ESTIMATE_PATIENT (1U << 7)
@@ -402,6 +400,7 @@
 #define FFTW_NO_SLOW (1U << 18)
 #define FFTW_NO_FIXED_RADIX_LARGE_N (1U << 19)
 #define FFTW_ALLOW_PRUNING (1U << 20)
+#define FFTW_WISDOM_ONLY (1U << 21)
 
 #ifdef __cplusplus
 }  /* extern "C" */