]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commit
blkid: fix building e2fsprogs with internal libblkid
authorEric Biggers <ebiggers@google.com>
Fri, 2 Mar 2018 05:21:35 +0000 (21:21 -0800)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 2 Mar 2018 21:31:16 +0000 (16:31 -0500)
commiteed9d845e84f6b74ce2d1a475020a17f2131e3d0
tree283a8665e14fda7bd26e42d97d861d562da9f114
parente7be7781e43a27321872adeeafdc40d30de6b061
blkid: fix building e2fsprogs with internal libblkid

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 <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
lib/blkid/list.h