aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-06-07 15:24:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-06-07 15:24:33 +0000
commit68031593c8cef319bda16f12279fd7fc8eb2d0c1 (patch)
tree919561aa2baf23ca40ba46a41d70696485fa161a
parent639ee81002e57018a4941b2dd8be1a9b560da67b (diff)
downloadupstream-68031593c8cef319bda16f12279fd7fc8eb2d0c1.tar.gz
upstream-68031593c8cef319bda16f12279fd7fc8eb2d0c1.tar.bz2
upstream-68031593c8cef319bda16f12279fd7fc8eb2d0c1.zip
e2fsprogs: add posix_memalign related portability patch from #8508
SVN-Revision: 32112
-rw-r--r--tools/e2fsprogs/patches/005-posix_memalign.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/tools/e2fsprogs/patches/005-posix_memalign.patch b/tools/e2fsprogs/patches/005-posix_memalign.patch
new file mode 100644
index 0000000000..2ce4ead892
--- /dev/null
+++ b/tools/e2fsprogs/patches/005-posix_memalign.patch
@@ -0,0 +1,31 @@
+--- a/lib/ext2fs/ext2fs.h
++++ b/lib/ext2fs/ext2fs.h
+@@ -1212,7 +1212,26 @@
+
+ if (align == 0)
+ align = 8;
+- if (retval = posix_memalign((void **) ptr, align, size)) {
++#ifdef HAVE_POSIX_MEMALIGN
++ retval = posix_memalign((void **)ptr, align, size);
++#else
++#ifdef HAVE_MEMALIGN
++ if ((*(void **)ptr = (void *)memalign(align, size)) == NULL)
++ retval = errno;
++ else
++ retval = 0;
++#else
++#ifdef HAVE_VALLOC
++ if ((*(void **)ptr = valloc(size)) == NULL)
++ retval = errno;
++ else
++ retval = 0;
++#else
++# error "Impossible to allocate aligned memory!"
++#endif /* HAVE_VALLOC */
++#endif /* HAVE_MEMALIGN */
++#endif /* HAVE_POSIX_MEMALIGN */
++ if (retval) {
+ if (retval == ENOMEM)
+ return EXT2_ET_NO_MEMORY;
+ return retval;
+--