From 08baac348c9aeb30ebb5c5a48abfb1b9f46767de Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Mon, 5 Aug 2019 14:45:57 -0700 Subject: [PATCH] Remove now unneeded #undef in __cxa_guard.cpp Before aosp/1086558, this was needed, since we would have _USING_LIBCXX defined, yet was not available, so we'd run into compiler issues. After that change, we're using __has_include() so this is no longer an issue. Test: build Change-Id: Ia81d343000e7d90f07422120fc1e1eb5becb01aa --- libc/bionic/__cxa_guard.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/libc/bionic/__cxa_guard.cpp b/libc/bionic/__cxa_guard.cpp index 30b5f41bd..e2e747791 100644 --- a/libc/bionic/__cxa_guard.cpp +++ b/libc/bionic/__cxa_guard.cpp @@ -16,9 +16,7 @@ #include #include -#undef _USING_LIBCXX // Prevent using of . #include - #include #include "private/bionic_futex.h"