commit 4c35405d24be3dc9c0f0e7ef28200f1097b2ca62
author Yi Kong <yikong@google.com> Thu Feb 28 18:29:11 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 28 18:29:11 2019 -0800
tree 7432fc50385dba5c94bcaf8f60e561597e5e6ceb
parent 59c27f95502565a47d0a6ae5d66a075b7d893b2e
parent 0771b752f1b955e7ded6ccbbf825b0ae93439eb5

Merge "Workaround string-plus-int warning"
am: 0771b752f1

Change-Id: I8d54690771c35612a15712ee9d260f82d76671ae

libc/bionic/strsignal.cpp

diff --git a/libc/bionic/strsignal.cpp b/libc/bionic/strsignal.cpp
index 5637431..05d3498 100644
--- a/libc/bionic/strsignal.cpp
+++ b/libc/bionic/strsignal.cpp
@@ -37,7 +37,7 @@
 };
 
 const char* const sys_signame[NSIG] = {
-#define __BIONIC_SIGDEF(signal_number, unused) [ signal_number ] = #signal_number + 3,
+#define __BIONIC_SIGDEF(signal_number, unused) [ signal_number ] = &(#signal_number)[3],
 #include "private/bionic_sigdefs.h"
 };