Fix compilation for non-Linux builds (thanks to FreeBSD folks).

Merge of master-melb:xfs-cmds:25140a by kenmcd.

diff --git a/doc/CHANGES b/doc/CHANGES
index a56d6e1e62e4d68342d569aad9aadc8abaadf7c3..a3447e2ee6d95d256ecd74a0c51febcdb7f09143 100644 (file)
--- 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 <mjancar@suse.cz> 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 57152e7d511040932afd1fe116411ac2983e69cb..e7ff3a8b32320a37a18a1b57afe4be8d8e9eb08d 100644 (file)
--- 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 b43591fd160541027d3fc2bb42f22155357355ec..4e7de5baf700510008f5f1136c768e9dd1aae421 100644 (file)
--- 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 d03afb52ed4134ffc112c09389057b194de01ada..deca4bcd91d925e3739fbdf4fb096d016fd04b0d 100644 (file)
--- a/include/irix.h
+++ b/include/irix.h
@@ -38,14 +38,6 @@
 #include <sys/fs/xfs_fsops.h>
 #include <sys/fs/xfs_itable.h>
 
-#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