diff options
| author | Nathan Scott <nathans@debian.org> | 2015-10-14 11:51:37 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-10-14 11:51:37 +1100 |
| commit | 5ce9dae1a5c8aa02f23174ef3521d0732c548928 (patch) | |
| tree | cde102b455c4865cd6d1606e22a87855816ab69c | |
| parent | 87d192ce12176e196353a680be8ae0b3a3297aec (diff) | |
| download | xfsdump-dev-5ce9dae1a5c8aa02f23174ef3521d0732c548928.tar.gz | |
xfsdump: remove use of __psint_t, it is no longer available
Commit ee6cd73ed1e in xfsprogs switched __psint_t to the standards
conforming intptr_t type - we need to make the same change here in
xfsdump for builds using the latest xfsprogs headers.
Signed-off-by: Nathan Scott <nathans@debian.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
| -rw-r--r-- | common/drive_minrmt.c | 4 | ||||
| -rw-r--r-- | common/drive_scsitape.c | 4 | ||||
| -rw-r--r-- | common/drive_simple.c | 4 | ||||
| -rw-r--r-- | common/util.h | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 |
5 files changed, 14 insertions, 8 deletions
diff --git a/common/drive_minrmt.c b/common/drive_minrmt.c index 5f5f96cb..8c576998 100644 --- a/common/drive_minrmt.c +++ b/common/drive_minrmt.c @@ -1969,7 +1969,7 @@ static size_t do_get_align_cnt( drive_t * drivep ) { char *next_alignment_point; - __psint_t next_alignment_off; + intptr_t next_alignment_off; drive_context_t *contextp; contextp = ( drive_context_t * )drivep->d_contextp; @@ -1990,7 +1990,7 @@ do_get_align_cnt( drive_t * drivep ) * the following algorithm works because all buffers are page-aligned * and a multiple of PGSZ. */ - next_alignment_off = ( __psint_t )contextp->dc_nextp; + next_alignment_off = ( intptr_t )contextp->dc_nextp; next_alignment_off += PGMASK; next_alignment_off &= ~PGMASK; next_alignment_point = ( char * )next_alignment_off; diff --git a/common/drive_scsitape.c b/common/drive_scsitape.c index 71b809f2..0abb5d06 100644 --- a/common/drive_scsitape.c +++ b/common/drive_scsitape.c @@ -2119,7 +2119,7 @@ static size_t do_get_align_cnt( drive_t * drivep ) { char *next_alignment_point; - __psint_t next_alignment_off; + intptr_t next_alignment_off; drive_context_t *contextp; contextp = ( drive_context_t * )drivep->d_contextp; @@ -2140,7 +2140,7 @@ do_get_align_cnt( drive_t * drivep ) * the following algorithm works because all buffers are page-aligned * and a multiple of PGSZ. */ - next_alignment_off = ( __psint_t )contextp->dc_nextp; + next_alignment_off = ( intptr_t )contextp->dc_nextp; next_alignment_off += PGMASK; next_alignment_off &= ~PGMASK; next_alignment_point = ( char * )next_alignment_off; diff --git a/common/drive_simple.c b/common/drive_simple.c index 401cd7fe..2b0447d8 100644 --- a/common/drive_simple.c +++ b/common/drive_simple.c @@ -1296,7 +1296,7 @@ static size_t do_get_align_cnt( drive_t *drivep ) { drive_context_t *contextp = ( drive_context_t * )drivep->d_contextp; - __psint_t next_alignment_off; + intptr_t next_alignment_off; char *next_alignment_point; mlog( MLOG_NITTY | MLOG_DRIVE, @@ -1313,7 +1313,7 @@ do_get_align_cnt( drive_t *drivep ) * the following algorithm works because dc_buf is page-aligned and * a multiple of PGSZ. */ - next_alignment_off = ( __psint_t )contextp->dc_nextp; + next_alignment_off = ( intptr_t )contextp->dc_nextp; next_alignment_off += PGMASK; next_alignment_off &= ~PGMASK; next_alignment_point = ( char * )next_alignment_off; diff --git a/common/util.h b/common/util.h index 86ea8d28..8ac1831f 100644 --- a/common/util.h +++ b/common/util.h @@ -163,8 +163,8 @@ extern void fold_init( fold_t fold, char *infostr, char c ); * Align pointer up to alignment */ #define ALIGN_PTR(p,a) \ - (((__psint_t)(p) & ((a)-1)) ? \ - ((void *)(((__psint_t)(p) + ((a)-1)) & ~((a)-1))) : \ + (((intptr_t)(p) & ((a)-1)) ? \ + ((void *)(((intptr_t)(p) + ((a)-1)) & ~((a)-1))) : \ ((void *)(p))) #endif /* UTIL_H */ diff --git a/debian/changelog b/debian/changelog index 54511665..308ffe32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xfsdump (3.1.5) unstable; urgency=low + + * New upstream release (closes: #799201) + + -- Nathan Scott <nathans@debian.org> Fri, 25 Sep 2015 08:42:23 +1000 + xfsdump (3.1.4) unstable; urgency=low * New upstream release (closes: #747079) |