aboutsummaryrefslogtreecommitdiffstats
path: root/tools/e2fsprogs/patches/005-posix_memalign.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2012-06-09 17:59:57 +0000
committerLuka Perkov <luka@openwrt.org>2012-06-09 17:59:57 +0000
commit57ce7e58fed136cf01c2ad7d666fd0c9c040c642 (patch)
treee836d3ef379b26ae9b144ff26c32a2adefe295bc /tools/e2fsprogs/patches/005-posix_memalign.patch
parent17595c437623b5d150b0ab898eb2e4f71671bcce (diff)
downloadupstream-57ce7e58fed136cf01c2ad7d666fd0c9c040c642.tar.gz
upstream-57ce7e58fed136cf01c2ad7d666fd0c9c040c642.tar.bz2
upstream-57ce7e58fed136cf01c2ad7d666fd0c9c040c642.zip
[tools] e2fsprogs: update to 1.42.3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32142 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/e2fsprogs/patches/005-posix_memalign.patch')
-rw-r--r--tools/e2fsprogs/patches/005-posix_memalign.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/tools/e2fsprogs/patches/005-posix_memalign.patch b/tools/e2fsprogs/patches/005-posix_memalign.patch
deleted file mode 100644
index 2ce4ead892..0000000000
--- a/tools/e2fsprogs/patches/005-posix_memalign.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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;
---