diff options
| author | Wenhao Wang <wenhaowang@google.com> | 2020-03-10 17:09:34 -0700 |
|---|---|---|
| committer | Wenhao Wang <wenhaowang@google.com> | 2020-03-18 02:54:26 +0000 |
| commit | d4cd0169eb4b60ee82053df69cc97dbfff7de27e (patch) | |
| tree | 1dc9e2a793d16a369384a287dd54950ca051e2d1 /lib | |
| parent | c68bbc86d3cab52e4aded8a6201abb645780943c (diff) | |
| download | common-d4cd0169eb4b60ee82053df69cc97dbfff7de27e.tar.gz | |
Split debug.h into another panic.h
BoringSSL has a static function called hexdump,
which conflicts the one declared in debug.h.
debug.h is included indirectly through assert.h.
And the function "panic" is the only function used
by assert.h. So we create a panic.h that contains
function panic such that debug.h is exluded from
assert.h.
Bug: 151183243
Change-Id: I83d905048832de12e78702ac0b4c6acafd1c6572
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/include/assert.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libc/include/assert.h b/lib/libc/include/assert.h index dec406e7..21d109a5 100644 --- a/lib/libc/include/assert.h +++ b/lib/libc/include/assert.h @@ -24,7 +24,7 @@ #define __ASSERT_H #include <compiler.h> -#include <debug.h> +#include <panic.h> #define ASSERT(x) \ do { if (unlikely(!(x))) { panic("ASSERT FAILED at (%s:%d): %s\n", __FILE__, __LINE__, #x); } } while (0) |