diff options
| author | Tianjie Xu <xunchang@google.com> | 2016-10-19 00:05:21 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-19 00:05:21 +0200 |
| commit | 434697f06b7432a2358550eadd74fb97d617035c (patch) | |
| tree | c24e3fb0f24bd693e63bfed48e497730164df079 /minzip/inline_magic.h | |
| parent | Merge "Change StringValue to use std::string" am: 2b17b24ae5 (diff) | |
| parent | resolve merge conflicts of 6fba98c to stage-aosp-master (diff) | |
| download | android_bootable_recovery-434697f06b7432a2358550eadd74fb97d617035c.tar android_bootable_recovery-434697f06b7432a2358550eadd74fb97d617035c.tar.gz android_bootable_recovery-434697f06b7432a2358550eadd74fb97d617035c.tar.bz2 android_bootable_recovery-434697f06b7432a2358550eadd74fb97d617035c.tar.lz android_bootable_recovery-434697f06b7432a2358550eadd74fb97d617035c.tar.xz android_bootable_recovery-434697f06b7432a2358550eadd74fb97d617035c.tar.zst android_bootable_recovery-434697f06b7432a2358550eadd74fb97d617035c.zip | |
Diffstat (limited to '')
| -rw-r--r-- | minzip/inline_magic.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/minzip/inline_magic.h b/minzip/inline_magic.h deleted file mode 100644 index 59c659f77..000000000 --- a/minzip/inline_magic.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2007 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 MINZIP_INLINE_MAGIC_H_ -#define MINZIP_INLINE_MAGIC_H_ - -#ifndef MINZIP_GENERATE_INLINES -#define INLINE extern inline __attribute((__gnu_inline__)) -#else -#define INLINE -#endif - -#endif // MINZIP_INLINE_MAGIC_H_ |