From 5b00a4c20de8290c8c1679f577a653e045078dfb Mon Sep 17 00:00:00 2001 From: jeroen Date: Mon, 14 Jun 2004 16:29:47 +0000 Subject: [PATCH] 2004-06-14 Jeroen Dekkers * stage2/ufs2.h (__uint8_t): Remove. (__uint16_t): Likewise. (__uint32_t): Likewise. (__uint64_t): Likewise. (ino_t): Typedef to uint32_t. --- ChangeLog | 8 ++++++++ stage2/ufs2.h | 13 +------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b20639ad..2bdf26847 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-06-14 Jeroen Dekkers + + * stage2/ufs2.h (__uint8_t): Remove. + (__uint16_t): Likewise. + (__uint32_t): Likewise. + (__uint64_t): Likewise. + (ino_t): Typedef to uint32_t. + 2004-06-13 Yoshinori K. Okuji * stage2/Makefile.am (noinst_HEADERS): Added ufs2.h. diff --git a/stage2/ufs2.h b/stage2/ufs2.h index 3eacf2b7e..7f44bbbe6 100644 --- a/stage2/ufs2.h +++ b/stage2/ufs2.h @@ -64,17 +64,6 @@ typedef uint16_t u_int16_t; typedef uint32_t u_int32_t; typedef uint64_t u_int64_t; -/* - * __uint* constants already defined in - * FreeBSD's /usr/include/machine/_types.h - */ -#ifndef _MACHINE__TYPES_H_ -typedef uint8_t __uint8_t; -typedef uint16_t __uint16_t; -typedef uint32_t __uint32_t; -typedef uint64_t __uint64_t; -#endif /* _MACHINE__TYPES_H_ */ - #define i_size di_size @@ -97,7 +86,7 @@ typedef int64_t ufs_lbn_t; typedef int64_t ufs_time_t; /* inode number */ -typedef __uint32_t ino_t; +typedef uint32_t ino_t; /* File permissions. */ #define IEXEC 0000100 /* Executable. */