From eed9d845e84f6b74ce2d1a475020a17f2131e3d0 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 1 Mar 2018 21:21:35 -0800 Subject: [PATCH] blkid: fix building e2fsprogs with internal libblkid MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Building e2fsprogs with the internal libblkid fails for me with the following compiler error: In file included from blkidP.h:27:0, from dev.c:17: dev.c: In function ‘blkid_free_dev’: ../../lib/blkid/list.h:149:42: error: ‘intptr_t’ undeclared (first use in this function); did you mean ‘__intptr_t’? ((type *)((char *)(ptr)-(unsigned long)(intptr_t)(&((type *)0)->member))) The problem is that lib/blkid/list.h is now using 'intptr_t', but stdint.h is not guaranteed to have been included yet. Include it. [ Changed to use inttypes.h if it is available and fall back to stdint.h if it is not available - tytso ] Fixes: 0a3d8041892c ("AOSP: build mke2fs for windows using android mingw library") Signed-off-by: Eric Biggers Signed-off-by: Theodore Ts'o --- lib/blkid/list.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/blkid/list.h b/lib/blkid/list.h index 26a5ac1..3e96dd8 100644 --- a/lib/blkid/list.h +++ b/lib/blkid/list.h @@ -5,6 +5,14 @@ extern "C" { #endif +#ifdef HAVE_INTTYPES_H +#include +#else +#ifdef HAVE_STDINT_H +#include +#endif +#endif + #ifdef __GNUC__ #define _INLINE_ static __inline__ #else /* For Watcom C */ -- 1.8.3.1