linux-ext4 - [e2fsprogs PATCH] blkid: fix building e2fsprogs with internal libblkid

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20180302052135.25913-1-ebiggers3@gmail.com>
Date:   Thu,  1 Mar 2018 21:21:35 -0800
From:   Eric Biggers <ebiggers3@...il.com>
To:     linux-ext4@...r.kernel.org
Cc:     Jin Qian <jinqian@...gle.com>, Eric Biggers <ebiggers@...gle.com>
Subject: [e2fsprogs PATCH] blkid: fix building e2fsprogs with internal libblkid

From: Eric Biggers <ebiggers@...gle.com>

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.

Fixes: 0a3d8041892c ("AOSP: build mke2fs for windows using android mingw library")
Signed-off-by: Eric Biggers <ebiggers@...gle.com>
---
 lib/blkid/list.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/blkid/list.h b/lib/blkid/list.h
index 7e0ccd77..bd29f284 100644
--- a/lib/blkid/list.h
+++ b/lib/blkid/list.h
@@ -5,6 +5,8 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
+
 #ifdef __GNUC__
 #define _INLINE_ static __inline__
 #else                         /* For Watcom C */
-- 
2.16.2