diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-22 13:39:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-22 14:18:26 (GMT) |
| commit | 64bdf0b7469437b101bb0f1cf641956e0b5d1bb0 (patch) | |
| tree | a1e4a0afe84abae702a17b38d7c98e5d127730f9 /Utilities/cmlibarchive | |
| parent | 8f837fc9a9fc335f87613e0c113050e1533d9efd (diff) | |
| download | CMake-64bdf0b7469437b101bb0f1cf641956e0b5d1bb0.zip CMake-64bdf0b7469437b101bb0f1cf641956e0b5d1bb0.tar.gz CMake-64bdf0b7469437b101bb0f1cf641956e0b5d1bb0.tar.bz2 | |
libarchive: Avoid non-portable u_int8_t
Use uint8_t that we prepare in config.h instead.
Diffstat (limited to 'Utilities/cmlibarchive')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_random.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c index 7891077..f4d4254 100644 --- a/Utilities/cmlibarchive/libarchive/archive_random.c +++ b/Utilities/cmlibarchive/libarchive/archive_random.c @@ -137,9 +137,9 @@ archive_random(void *buf, size_t nbytes) #endif /* !__GNUC__ */ struct arc4_stream { - u_int8_t i; - u_int8_t j; - u_int8_t s[256]; + uint8_t i; + uint8_t j; + uint8_t s[256]; }; static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; @@ -159,7 +159,7 @@ static struct arc4_stream rs; static pid_t arc4_stir_pid; static int arc4_count; -static inline u_int8_t arc4_getbyte(void); +static inline uint8_t arc4_getbyte(void); static void arc4_stir(void); static inline void @@ -177,7 +177,7 @@ static inline void arc4_addrandom(u_char *dat, int datlen) { int n; - u_int8_t si; + uint8_t si; rs.i--; for (n = 0; n < 256; n++) { @@ -239,10 +239,10 @@ arc4_stir_if_needed(void) } } -static inline u_int8_t +static inline uint8_t arc4_getbyte(void) { - u_int8_t si, sj; + uint8_t si, sj; rs.i = (rs.i + 1); si = rs.s[rs.i]; |