diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-13 03:43:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-13 03:43:11 +0000 |
| commit | fadc8a7777ca304c8a7de066a94effd3a5471ee6 (patch) | |
| tree | 55c1a2a77c279f671d77e23ff1ee89946fd6efde /libc | |
| parent | fc48e8cf28b80ce0f95e288eeee459b4cb932afa (diff) | |
| parent | 671e236d5fd2cae169c2a31d0a35e66c4fcc5556 (diff) | |
| download | bionic-fadc8a7777ca304c8a7de066a94effd3a5471ee6.zip bionic-fadc8a7777ca304c8a7de066a94effd3a5471ee6.tar.gz bionic-fadc8a7777ca304c8a7de066a94effd3a5471ee6.tar.bz2 | |
Merge "Restore sys_signame for LP64."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/bionic/sys_signame.c | 4 | ||||
| -rw-r--r-- | libc/include/signal.h | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/libc/bionic/sys_signame.c b/libc/bionic/sys_signame.c index 41d34af..e1286f2 100644 --- a/libc/bionic/sys_signame.c +++ b/libc/bionic/sys_signame.c @@ -28,11 +28,7 @@ #include <signal.h> -#if !defined(__LP64__) - const char* const sys_signame[NSIG] = { #define __BIONIC_SIGDEF(signal_number, unused) [ signal_number ] = #signal_number + 3, #include <sys/_sigdefs.h> }; - -#endif diff --git a/libc/include/signal.h b/libc/include/signal.h index 58288a1..29bef57 100644 --- a/libc/include/signal.h +++ b/libc/include/signal.h @@ -61,9 +61,7 @@ typedef int sig_atomic_t; #define NSIG _NSIG extern const char* const sys_siglist[]; -#if !defined(__LP64__) -extern const char* const sys_signame[]; -#endif +extern const char* const sys_signame[]; /* BSD compatibility. */ typedef __sighandler_t sig_t; /* BSD compatibility. */ typedef __sighandler_t sighandler_t; /* glibc compatibility. */ |