From c40c1c52d68049434b1379c3a6d8652a1363bb07 Mon Sep 17 00:00:00 2001 From: bigbiff Date: Sat, 1 Nov 2014 09:34:57 -0400 Subject: This patchset causes issues with backups. Revert "update exfat from current head" This reverts commit 2e33c5ee0b1a1ece068489e8fd99f3e4eb3501b5. Change-Id: I00d19d98f721bb50aa937ca15b11fe3491132fcd --- exfat/libexfat/platform.h | 73 ++++++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 29 deletions(-) (limited to 'exfat/libexfat/platform.h') diff --git a/exfat/libexfat/platform.h b/exfat/libexfat/platform.h index c81e10e9e..320f757e8 100644 --- a/exfat/libexfat/platform.h +++ b/exfat/libexfat/platform.h @@ -3,12 +3,11 @@ OS-specific code (libc-specific in fact). Note that systems with the same kernel can use different libc implementations. - Free exFAT implementation. - Copyright (C) 2010-2014 Andrew Nayenko + Copyright (C) 2010-2013 Andrew Nayenko - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -16,9 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #ifndef PLATFORM_H_INCLUDED @@ -28,37 +26,54 @@ #include #include -#define exfat_bswap16(x) bswap_16(x) -#define exfat_bswap32(x) bswap_32(x) -#define exfat_bswap64(x) bswap_64(x) -#define EXFAT_BYTE_ORDER __BYTE_ORDER -#define EXFAT_LITTLE_ENDIAN __LITTLE_ENDIAN -#define EXFAT_BIG_ENDIAN __BIG_ENDIAN #elif defined(__APPLE__) #include #include -#define exfat_bswap16(x) OSSwapInt16(x) -#define exfat_bswap32(x) OSSwapInt32(x) -#define exfat_bswap64(x) OSSwapInt64(x) -#define EXFAT_BYTE_ORDER BYTE_ORDER -#define EXFAT_LITTLE_ENDIAN LITTLE_ENDIAN -#define EXFAT_BIG_ENDIAN BIG_ENDIAN +#define bswap_16(x) OSSwapInt16(x) +#define bswap_32(x) OSSwapInt32(x) +#define bswap_64(x) OSSwapInt64(x) +#define __BYTE_ORDER BYTE_ORDER +#define __LITTLE_ENDIAN LITTLE_ENDIAN +#define __BIG_ENDIAN BIG_ENDIAN -#endif -//#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) #include -#define exfat_bswap16(x) bswap16(x) -#define exfat_bswap32(x) bswap32(x) -#define exfat_bswap64(x) bswap64(x) -#define EXFAT_BYTE_ORDER _BYTE_ORDER -#define EXFAT_LITTLE_ENDIAN _LITTLE_ENDIAN -#define EXFAT_BIG_ENDIAN _BIG_ENDIAN +#define bswap_16(x) bswap16(x) +#define bswap_32(x) bswap32(x) +#define bswap_64(x) bswap64(x) +#define __BYTE_ORDER _BYTE_ORDER +#define __LITTLE_ENDIAN _LITTLE_ENDIAN +#define __BIG_ENDIAN _BIG_ENDIAN + +#elif defined(__OpenBSD__) + +#include +#define bswap_16(x) swap16(x) +#define bswap_32(x) swap32(x) +#define bswap_64(x) swap64(x) +#define __BYTE_ORDER _BYTE_ORDER +#define __LITTLE_ENDIAN _LITTLE_ENDIAN +#define __BIG_ENDIAN _BIG_ENDIAN + +#elif defined(__sun) + +#include +#define bswap_16(x) BSWAP_16(x) +#define bswap_32(x) BSWAP_32(x) +#define bswap_64(x) BSWAP_64(x) +#define __LITTLE_ENDIAN 1234 +#define __BIG_ENDIAN 4321 +#ifdef _LITTLE_ENDIAN +#define __BYTE_ORDER __LITTLE_ENDIAN +#else +#define __BYTE_ORDER __BIG_ENDIAN +#endif -/* #else #error Unknown platform -*/ +#endif + #endif /* ifndef PLATFORM_H_INCLUDED */ -- cgit v1.2.3