diff options
| author | Greg Hackmann <ghackmann@google.com> | 2015-04-16 22:09:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-16 22:09:01 +0000 |
| commit | 7364f24d7e95d84beda8c82bef4dd6a38929af9a (patch) | |
| tree | 0199ef0aef74fcfa89229137f78aa3c839250d88 /include | |
| parent | 61e4f2d44637f18ad1104edc034ae1d0f0b2df8c (diff) | |
| parent | 4601fbb8190723be24aab787ee62c2fc29523e30 (diff) | |
| download | system_core-7364f24d7e95d84beda8c82bef4dd6a38929af9a.tar.gz system_core-7364f24d7e95d84beda8c82bef4dd6a38929af9a.tar.bz2 system_core-7364f24d7e95d84beda8c82bef4dd6a38929af9a.zip | |
am 4601fbb8: am ec682735: am 0e2d6015: Merge "Revert "cutils: add OS-independent endian.h""
* commit '4601fbb8190723be24aab787ee62c2fc29523e30':
Revert "cutils: add OS-independent endian.h"
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/endian.h | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/include/cutils/endian.h b/include/cutils/endian.h deleted file mode 100644 index 3d27ce694..000000000 --- a/include/cutils/endian.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __CUTILS_ENDIAN_H -#define __CUTILS_ENDIAN_H - -#if defined(__linux__) && !defined(TEST_CUTILS_ENDIAN_H) -#include <endian.h> -#else - -#if !defined(__BYTE_ORDER__) -/* gcc and clang predefine __BYTE_ORDER__, so this should never happen */ -#error Compiler does not define __BYTE_ORDER__ -#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -#define htobe16(x) (x) -#define htobe32(x) (x) -#define htobe64(x) (x) -#define htole16(x) __builtin_bswap16(x) -#define htole32(x) __builtin_bswap32(x) -#define htole64(x) __builtin_bswap64(x) -#else -#define htobe16(x) __builtin_bswap16(x) -#define htobe32(x) __builtin_bswap32(x) -#define htobe64(x) __builtin_bswap64(x) -#define htole16(x) (x) -#define htole32(x) (x) -#define htole64(x) (x) -#endif /* __BYTE_ORDER__ */ - -#define be16toh(x) htobe16(x) -#define le16toh(x) htole16(x) -#define be32toh(x) htobe32(x) -#define le32toh(x) htole32(x) -#define be64toh(x) htobe64(x) -#define le64toh(x) htole64(x) - -#endif /* defined(__linux__) */ - -#endif /* __CUTILS_ENDIAN_H */ |