commit 94c36d27974cdd86265c5b24b8e158db548a9ba5
author Yi Kong <yikong@google.com> Thu Feb 28 18:33:17 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 28 18:33:17 2019 -0800
tree 7432fc50385dba5c94bcaf8f60e561597e5e6ceb
parent 6a22f7ca81d3fb342d8cf7d46dbd221a53bb23f5
parent 4c35405d24be3dc9c0f0e7ef28200f1097b2ca62

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

Change-Id: Ic4ccbe9e1f8908cb35bd9285bee3bbf738dd6ed5

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"
 };