Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7320cd61 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 83ebca02: am ac252357: Merge "Remove atomic-inline.h." 

* commit '83ebca02':
  Remove atomic-inline.h.
parents 98c58699 83ebca02

include/cutils/aref.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <stddef.h>

#include <sys/cdefs.h>



#include <cutils/atomic-inline.h>

#include <cutils/atomic.h>



__BEGIN_DECLS

include/cutils/atomic-inline.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

 * 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

include/cutils/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -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