Merge "libutils: sp/wp: undef #defines"

am: d5c3fe6952

Change-Id: I7316502cc50efd08247d8f6f5a0b2ba16bbb3a48
This commit is contained in:
Steven Moreland 2019-12-20 09:09:24 -08:00 committed by android-build-merger
commit 0b955f333d
2 changed files with 3 additions and 1 deletions

View file

@ -455,6 +455,7 @@ private:
};
#undef COMPARE_WEAK
#undef COMPARE_WEAK_FUNCTIONAL
// ---------------------------------------------------------------------------
// No user serviceable parts below here.

View file

@ -134,7 +134,8 @@ private:
void sp_report_race();
void sp_report_stack_pointer();
#undef COMPARE
#undef COMPARE_STRONG
#undef COMPARE_STRONG_FUNCTIONAL
// ---------------------------------------------------------------------------
// No user serviceable parts below here.