Merge "Remove atomic-inline.h."
This commit is contained in:
commit
ac252357bb
3 changed files with 2 additions and 21 deletions
|
@ -20,7 +20,7 @@
|
|||
#include <stddef.h>
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
#include <cutils/atomic-inline.h>
|
||||
#include <cutils/atomic.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue