diff options
| author | Karel Zak | 2016-03-07 14:37:31 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-03-07 14:37:31 +0100 |
| commit | bcceb0c7dd61fb876b34e668a6887b92bcce8fca (patch) | |
| tree | ae90976b9e627d7c01714e2c7f2697cd30caad05 /libfdisk | |
| parent | setarch: fix personality syscall return code check (diff) | |
| parent | lib: include strutils.h for mempcpy() (diff) | |
| download | kernel-qcow2-util-linux-bcceb0c7dd61fb876b34e668a6887b92bcce8fca.tar.gz kernel-qcow2-util-linux-bcceb0c7dd61fb876b34e668a6887b92bcce8fca.tar.xz kernel-qcow2-util-linux-bcceb0c7dd61fb876b34e668a6887b92bcce8fca.zip | |
Merge branch 'port-osx' of https://github.com/rudimeier/util-linux
* 'port-osx' of https://github.com/rudimeier/util-linux:
lib: include strutils.h for mempcpy()
build-sys: remove duplicate cal sources
lib: provide fallback if mkostemp(3) missing
build-sys: chrt requires a sched_set* function
build-sys: add --disable-ipcrm --disable-ipcs
build-sys: disable login-utils if shadow.h or utmp.h is missing
login-utils: minor utmp cleanup
build-sys: build_init should check for flock
newgrp: rename memset_s()
misc: fix some includes
libsmartcols: fix uninitialized variable
fdisk: fix warning, incompatible pointer types passing 'uint64_t *'
logger: use SCM_CREDENTIALS on LINUX only
Diffstat (limited to 'libfdisk')
| -rw-r--r-- | libfdisk/src/gpt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c index f795b35a2..cd88df0e6 100644 --- a/libfdisk/src/gpt.c +++ b/libfdisk/src/gpt.c @@ -2564,7 +2564,8 @@ static int gpt_toggle_partition_flag( unsigned long flag) { struct fdisk_gpt_label *gpt; - uint64_t attrs, tmp; + uint64_t attrs; + uintmax_t tmp; char *bits; const char *name = NULL; int bit = -1, rc; |