diff options
| author | Hans Boehm <hboehm@google.com> | 2014-10-04 01:36:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-04 01:36:18 +0000 |
| commit | 072877af485d49f11e227c0d22a7bb4a341533d6 (patch) | |
| tree | 27ee4adac9207478417deadc93745f28b96a5126 /libcutils | |
| parent | f5204549faf7310cc808bcb3676fb36268178e26 (diff) | |
| parent | 41198eea42b7a6f1d4222abd7a5fec965d11b238 (diff) | |
| download | system_core-072877af485d49f11e227c0d22a7bb4a341533d6.zip system_core-072877af485d49f11e227c0d22a7bb4a341533d6.tar.gz system_core-072877af485d49f11e227c0d22a7bb4a341533d6.tar.bz2 | |
am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
* commit '41198eea42b7a6f1d4222abd7a5fec965d11b238':
Revert "Rewrite atomic.h to use stdatomic.h."
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/atomic.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libcutils/atomic.c b/libcutils/atomic.c index d34aa00..1484ef8 100644 --- a/libcutils/atomic.c +++ b/libcutils/atomic.c @@ -14,13 +14,6 @@ * limitations under the License. */ -/* - * Generate non-inlined versions of android_atomic functions. - * Nobody should be using these, but some binary blobs currently (late 2014) - * are. - * If you read this in 2015 or later, please try to delete this file. - */ - #define ANDROID_ATOMIC_INLINE -#include <cutils/atomic.h> +#include <cutils/atomic-inline.h> |