diff options
| author | Karel Zak | 2009-10-16 11:43:02 +0200 |
|---|---|---|
| committer | Karel Zak | 2009-10-16 11:43:02 +0200 |
| commit | 83aca6b072baace04fc785c07ea79fdc8b12a4db (patch) | |
| tree | af63f485a0f2fc5f234378e5a694c3a326a2b966 /fdisk/fdisksgilabel.h | |
| parent | libblkid: add support for VMFS (VMware File System) (diff) | |
| download | kernel-qcow2-util-linux-83aca6b072baace04fc785c07ea79fdc8b12a4db.tar.gz kernel-qcow2-util-linux-83aca6b072baace04fc785c07ea79fdc8b12a4db.tar.xz kernel-qcow2-util-linux-83aca6b072baace04fc785c07ea79fdc8b12a4db.zip | |
fdisk: sgi label - remove duplicate swab16swab[16,32]() definitions
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisk/fdisksgilabel.h')
| -rw-r--r-- | fdisk/fdisksgilabel.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fdisk/fdisksgilabel.h b/fdisk/fdisksgilabel.h index a4704e4da..1445fa94a 100644 --- a/fdisk/fdisksgilabel.h +++ b/fdisk/fdisksgilabel.h @@ -2,6 +2,9 @@ #define FDISK_SGI_LABEL_H #include <stdint.h> + +#include "bitops.h" + /* * Copyright (C) Andreas Neuper, Sep 1998. * This file may be modified and redistributed under @@ -98,10 +101,9 @@ typedef struct { #define SGI_LABEL_MAGIC_SWAPPED 0x41a9e50b #define SGI_INFO_MAGIC 0x00072959 #define SGI_INFO_MAGIC_SWAPPED 0x59290700 -#define SSWAP16(x) (other_endian ? __swap16(x) \ - : (uint16_t)(x)) -#define SSWAP32(x) (other_endian ? __swap32(x) \ - : (uint32_t)(x)) + +#define SSWAP16(x) (other_endian ? swab16(x) : (uint16_t)(x)) +#define SSWAP32(x) (other_endian ? swab32(x) : (uint32_t)(x)) /* fdisk.c */ #define sgilabel ((sgi_partition *)MBRbuffer) |