Patchwork ext2fs: fix undeclared posix_memalign() warning

login
register
mail settings
Submitter Andreas Dilger
Date June 10, 2011, 5:17 a.m.
Message ID <1307683036-4564-1-git-send-email-adilger@whamcloud.com>
Download mbox | patch
Permalink /patch/99842/
State Accepted
Headers show

Comments

Andreas Dilger - June 10, 2011, 5:17 a.m.
Older distros do not define posix_memalign() by default in the
headers.  If ext2fs.h is included early in the headers, it is
possible to "#define _XOPEN_SOURCE 600" so that the stdlib.h
header will define it, but if ext2fs.h is included after stdlib.h
there is no posix_memalign() declaration.

Add a posix_memalign() declaration if stdlib.h didn't do it.  This
is a bit of a hack for GNU headers, but it works on Linux and OS/X
without problems.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
---
 lib/ext2fs/ext2fs.h |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
Theodore Ts'o - June 11, 2011, 3:05 p.m.
On Thu, Jun 09, 2011 at 11:17:16PM -0600, Andreas Dilger wrote:
> Older distros do not define posix_memalign() by default in the
> headers.  If ext2fs.h is included early in the headers, it is
> possible to "#define _XOPEN_SOURCE 600" so that the stdlib.h
> header will define it, but if ext2fs.h is included after stdlib.h
> there is no posix_memalign() declaration.
> 
> Add a posix_memalign() declaration if stdlib.h didn't do it.  This
> is a bit of a hack for GNU headers, but it works on Linux and OS/X
> without problems.
> 
> Signed-off-by: Andreas Dilger <adilger@whamcloud.com>

Applied into the next branch, thanks.

						- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 9acccf2..975ab9d 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -29,6 +29,10 @@  extern "C" {
 #define NO_INLINE_FUNCS
 #endif
 
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600	/* for posix_memalign() */
+#endif
+
 /*
  * Where the master copy of the superblock is located, and how big
  * superblocks are supposed to be.  We define SUPERBLOCK_SIZE because
@@ -37,7 +41,7 @@  extern "C" {
  * 1032 bytes long).
  */
 #define SUPERBLOCK_OFFSET	1024
-#define SUPERBLOCK_SIZE 	1024
+#define SUPERBLOCK_SIZE		1024
 
 /*
  * The last ext2fs revision level that this version of the library is
@@ -54,6 +58,13 @@  extern "C" {
 #include <string.h>
 #include <errno.h>
 
+#ifndef __USE_XOPEN2K
+/* If the "#define _XOPEN_SOURCE 600" didn't succeed in declaring
+ * posix_memalign(), maybe due to <features.h> or <stdlib.h> included beforej
+ * _XOPEN_SOURCE, declare it here to avoid compiler warnings. */
+extern int posix_memalign(void **__memptr, size_t __alignment, size_t __size);
+#endif
+
 #if EXT2_FLAT_INCLUDES
 #include "e2_types.h"
 #include "ext2_fs.h"