summaryrefslogtreecommitdiff
path: root/math/fftw3/files/patch-alloc.c
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2004-12-09 19:21:04 +0000
committerMichael Johnson <ahze@FreeBSD.org>2004-12-09 19:21:04 +0000
commit34fd254c7690ca030e070c88dfbb1ccd7afe450d (patch)
tree2c71a49de90c2a9fa38c14e051326ce45586fec4 /math/fftw3/files/patch-alloc.c
parentFix a problem with the pkg-plist which failed to remove some directories (diff)
- Add note about WITH_OPTIMIZED_ATHLON will fall back to 3dNow if you don't have
a Athlon - Fix man pages so they say ${PREFIX}/etc instead of /etc - Fix core dump of fftw-wisdom in >=5.x [1] by removing a dirty work around to use a 16-byte aligned maloc by really using freebsd's 16-byte aligned maloc Reported by: phk
Notes
Notes: svn path=/head/; revision=123577
Diffstat (limited to 'math/fftw3/files/patch-alloc.c')
-rw-r--r--math/fftw3/files/patch-alloc.c27
1 files changed, 9 insertions, 18 deletions
diff --git a/math/fftw3/files/patch-alloc.c b/math/fftw3/files/patch-alloc.c
index 16d35e160353..0294284563ef 100644
--- a/math/fftw3/files/patch-alloc.c
+++ b/math/fftw3/files/patch-alloc.c
@@ -1,21 +1,12 @@
---- kernel/alloc.c.orig Sun May 30 16:26:22 2004
-+++ kernel/alloc.c Sun May 30 16:27:34 2004
-@@ -30,6 +30,8 @@
- # endif
- #endif
+--- kernel/alloc.c.orig Sat Mar 15 15:29:43 2003
++++ kernel/alloc.c Thu Dec 9 03:31:56 2004
+@@ -79,6 +79,9 @@
+ # undef real_free
+ # define real_free our_free16
-+#include <stdlib.h>
+
- #if defined(HAVE_DECL_POSIX_MEMALIGN) && !HAVE_DECL_POSIX_MEMALIGN
- extern int posix_memalign(void **, size_t, size_t);
- #endif
-@@ -122,9 +124,6 @@
- # define real_free MPFree
++# elif defined(__FreeBSD__)
++ p = malloc(n);
+ # elif defined(HAVE_MEMALIGN)
+ p = memalign(MIN_ALIGNMENT, n);
- # else
-- /* Add your machine here and send a patch to fftw@fftw.org
-- or (e.g. for Windows) configure --with-our-malloc16 */
--# error "Don't know how to malloc() aligned memory."
- # endif
-
- #else /* !defined(MIN_ALIGMENT) */