diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 14:38:56 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-11-17 14:38:56 -0800 |
| commit | c3914d2be2ea61daa9a670ae8e18b2bac6a6647b (patch) | |
| tree | d75a166883acaf41c9d34fda9daf657ede0603d0 | |
| parent | 3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669 (diff) | |
| download | system_core-c3914d2be2ea61daa9a670ae8e18b2bac6a6647b.zip system_core-c3914d2be2ea61daa9a670ae8e18b2bac6a6647b.tar.gz system_core-c3914d2be2ea61daa9a670ae8e18b2bac6a6647b.tar.bz2 | |
Remove atomic-inline.h.
Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
| -rw-r--r-- | include/cutils/aref.h | 2 | ||||
| -rw-r--r-- | include/cutils/atomic-inline.h | 19 | ||||
| -rw-r--r-- | include/cutils/trace.h | 2 |
3 files changed, 2 insertions, 21 deletions
diff --git a/include/cutils/aref.h b/include/cutils/aref.h index e40dc70..3bd36ea 100644 --- a/include/cutils/aref.h +++ b/include/cutils/aref.h @@ -20,7 +20,7 @@ #include <stddef.h> #include <sys/cdefs.h> -#include <cutils/atomic-inline.h> +#include <cutils/atomic.h> __BEGIN_DECLS diff --git a/include/cutils/atomic-inline.h b/include/cutils/atomic-inline.h deleted file mode 100644 index 103c5b0..0000000 --- a/include/cutils/atomic-inline.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2014 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 ANDROID_CUTILS_ATOMIC_H -#include <cutils/atomic.h> -#endif diff --git a/include/cutils/trace.h b/include/cutils/trace.h index 6ca8293..59ff6c1 100644 --- a/include/cutils/trace.h +++ b/include/cutils/trace.h @@ -25,8 +25,8 @@ #include <sys/types.h> #include <unistd.h> +#include <cutils/atomic.h> #include <cutils/compiler.h> -#include <cutils/atomic-inline.h> __BEGIN_DECLS |