2004-06-14 Jeroen Dekkers <jeroen@dekkers.cx>

	* stage2/ufs2.h (__uint8_t): Remove.
	(__uint16_t): Likewise.
	(__uint32_t): Likewise.
	(__uint64_t): Likewise.
	(ino_t): Typedef to uint32_t.

diff --git a/ChangeLog b/ChangeLog
index 2b20639ad6237f2afabfa8c63c4b1bb1e1673841..2bdf26847969ee7efad06e436c13ec2889e35d3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-14  Jeroen Dekkers  <jeroen@dekkers.cx>
+
+       * 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  <okuji@enbug.org>
 
        * stage2/Makefile.am (noinst_HEADERS): Added ufs2.h.

diff --git a/stage2/ufs2.h b/stage2/ufs2.h
index 3eacf2b7e13b272f8dad021dc634dd0d9cedd397..7f44bbbe6852e7bcb4d3305e1f57250e5c561bb0 100644 (file)
--- 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. */