From 5fa3142cdbb67cbb8287b2ec4fc35ee6532b3c6d Mon Sep 17 00:00:00 2001 From: Kiyoshi Aman Date: Thu, 16 May 2019 11:47:54 -0500 Subject: bin/dd: make buildable with libbsd --- bin/dd/extern.h | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'bin/dd/extern.h') diff --git a/bin/dd/extern.h b/bin/dd/extern.h index 27b51a0..6185f4d 100644 --- a/bin/dd/extern.h +++ b/bin/dd/extern.h @@ -35,13 +35,14 @@ * @(#)extern.h 8.3 (Berkeley) 4/2/94 */ -#include +#define NO_IOFLAG +#define NO_MSGFMT #ifdef NO_CONV -__dead void block(void); -__dead void block_close(void); -__dead void unblock(void); -__dead void unblock_close(void); +void block(void); +void block_close(void); +void unblock(void); +void unblock_close(void); #else void block(void); void block_close(void); @@ -61,7 +62,7 @@ void pos_in(void); void pos_out(void); void summary(void); void summaryx(int); -__dead void terminate(int); +void terminate(int); void unblock(void); void unblock_close(void); ssize_t bwrite(IO *, const void *, size_t); @@ -71,16 +72,17 @@ extern STAT st; extern void (*cfunc)(void); extern uint64_t cpy_cnt; extern uint64_t cbsz; -extern u_int ddflags; +extern uint32_t ddflags; #ifndef NO_IOFLAG -extern u_int iflag; -extern u_int oflag; +extern uint32_t iflag; +extern uint32_t oflag; #endif /* NO_IOFLAG */ -extern u_int files_cnt; +extern unsigned int files_cnt; extern uint64_t progress; -extern const u_char *ctab; -extern const u_char a2e_32V[], a2e_POSIX[]; -extern const u_char e2a_32V[], e2a_POSIX[]; -extern const u_char a2ibm_32V[], a2ibm_POSIX[]; -extern u_char casetab[]; +extern const uint8_t *ctab; +extern const uint8_t a2e_32V[], a2e_POSIX[]; +extern const uint8_t e2a_32V[], e2a_POSIX[]; +extern const uint8_t a2ibm_32V[], a2ibm_POSIX[]; +extern uint8_t casetab[]; extern const char *msgfmt; +extern long long strsuftoll(const char *, const char *, long long, long long); -- cgit v1.2.3-60-g2f50