From 4e0fd353d1afbee39e6a7082ccfea6545e95d45c Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Wed, 8 Feb 2006 02:50:45 +0000 Subject: [PATCH] Fix compilation for non-Linux builds (thanks to FreeBSD folks). Merge of master-melb:xfs-cmds:25140a by kenmcd. --- doc/CHANGES | 2 ++ include/darwin.h | 8 -------- include/freebsd.h | 9 --------- include/irix.h | 8 -------- 4 files changed, 2 insertions(+), 25 deletions(-) diff --git a/doc/CHANGES b/doc/CHANGES index a56d6e1e6..a3447e2ee 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -2,6 +2,8 @@ xfsprogs-2.7.13 (08 February 2006) - Convert fsck into a shell script and make it provide a hint to run repair/check (in non-auto fsck modes). Thanks to Marian Jancar for this. + - Fix compilation botch on non-Linux platforms (duplicate + type definitions). xfsprogs-2.7.12 (31 January 2006) - Added initial Polish translation. diff --git a/include/darwin.h b/include/darwin.h index 57152e7d5..e7ff3a8b3 100644 --- a/include/darwin.h +++ b/include/darwin.h @@ -70,14 +70,6 @@ static __inline__ void platform_getoptreset(void) #define __uint16_t u_int16_t #define __uint32_t u_int32_t #define __uint64_t u_int64_t -#define __s8 int8_t -#define __s16 int16_t -#define __s32 int32_t -#define __s64 int64_t -#define __u8 u_int8_t -#define __u16 u_int16_t -#define __u32 u_int32_t -#define __u64 u_int64_t #define loff_t off_t #define off64_t off_t diff --git a/include/freebsd.h b/include/freebsd.h index b43591fd1..4e7de5baf 100644 --- a/include/freebsd.h +++ b/include/freebsd.h @@ -39,15 +39,6 @@ #define fdatasync fsync #define memalign(a,size) valloc(size) -typedef u_int8_t __u8; -typedef int8_t __s8; -typedef u_int16_t __u16; -typedef int16_t __s16; -typedef u_int32_t __u32; -typedef int32_t __s32; -typedef u_int64_t __u64; -typedef int64_t __s64; - #define constpp char * const * #define EFSCORRUPTED 990 /* Filesystem is corrupted */ diff --git a/include/irix.h b/include/irix.h index d03afb52e..deca4bcd9 100644 --- a/include/irix.h +++ b/include/irix.h @@ -38,14 +38,6 @@ #include #include -#define __s8 char -#define __s16 short -#define __s32 __int32_t -#define __s64 __int64_t -#define __u8 unsigned char -#define __u16 unsigned short -#define __u32 __uint32_t -#define __u64 __uint64_t #define __int8_t char #define __int16_t short #define __uint8_t unsigned char -- 2.47.2