Merge "Remove now unneeded #undef in __cxa_guard.cpp" am: 5dea560e4c

am: 37ba89a702

Change-Id: Ia82f762aa3fdb827110618cf1f2935e0b9f6b660
This commit is contained in:
Tom Cherry 2019-08-07 16:39:31 -07:00 committed by android-build-merger
commit c0aeab3459

View file

@ -16,9 +16,7 @@
#include <endian.h>
#include <limits.h>
#undef _USING_LIBCXX // Prevent using of <atomic>.
#include <stdatomic.h>
#include <stddef.h>
#include "private/bionic_futex.h"