diff options
author | Elliott Hughes <enh@google.com> | 2015-02-17 16:26:37 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2015-02-17 16:26:37 -0800 |
commit | 3129384386cfe3ababba29e13670be0420bd3710 (patch) | |
tree | 2bd2aa6e84c7c59fd67c3dc44ab1db0889cc92ef /0.153/host-darwin-fixup/endian.h | |
parent | 5bc640e93d4c9fbe1dab673e550b7b9a084b4b92 (diff) | |
parent | a18b309395beb83ab26a8499d35c771016a3cadd (diff) | |
download | android_external_elfutils-3129384386cfe3ababba29e13670be0420bd3710.tar.gz android_external_elfutils-3129384386cfe3ababba29e13670be0420bd3710.tar.bz2 android_external_elfutils-3129384386cfe3ababba29e13670be0420bd3710.zip |
resolved conflicts for merge of a18b3093 to master
Change-Id: I1f1ed7b6a3ce28edabdd3ac8aeccbe54a127d44e
Diffstat (limited to '0.153/host-darwin-fixup/endian.h')
-rw-r--r-- | 0.153/host-darwin-fixup/endian.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/0.153/host-darwin-fixup/endian.h b/0.153/host-darwin-fixup/endian.h deleted file mode 100644 index 14bb32df..00000000 --- a/0.153/host-darwin-fixup/endian.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2013, 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 ELFUTILS_ENDIAN_H -#define ELFUTILS_ENDIAN_H - -#define __LITTLE_ENDIAN (1234) -#define __BIG_ENDIAN (4321) -#define __BYTE_ORDER __LITTLE_ENDIAN - -#endif /* ELFUTILS_ENDIAN_H */ |