generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am fadc8a77: Merge "Restore sys_signame for LP64."

Browse Source 
* commit 'fadc8a7777ca304c8a7de066a94effd3a5471ee6':
  Restore sys_signame for LP64.
This commit is contained in:
Elliott Hughes 2014-03-07 02:30:04 +00:00 committed by Android Git Automerger
commit 93a0c03463
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/bionic/sys_signame.c
View File

@ -28,11 +28,7 @@
#include <signal.h> #include <signal.h>
#if !defined(__LP64__)
const char* const sys_signame[NSIG] = { 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 <sys/_sigdefs.h> #include <sys/_sigdefs.h>
}; };
#endif

4
libc/include/signal.h
View File

@ -61,9 +61,7 @@ typedef int sig_atomic_t;
#define NSIG _NSIG #define NSIG _NSIG
extern const char* const sys_siglist[]; extern const char* const sys_siglist[];
#if !defined(__LP64__) extern const char* const sys_signame[]; /* BSD compatibility. */
extern const char* const sys_signame[];
#endif
typedef __sighandler_t sig_t; /* BSD compatibility. */ typedef __sighandler_t sig_t; /* BSD compatibility. */
typedef __sighandler_t sighandler_t; /* glibc compatibility. */ typedef __sighandler_t sighandler_t; /* glibc compatibility. */

2
tests/signal_test.cpp
View File

@ -240,7 +240,7 @@ TEST(signal, sigaction) {
} }
TEST(signal, sys_signame) { TEST(signal, sys_signame) {
#if defined(__BIONIC__) && !defined(__LP64__) #if defined(__BIONIC__)
ASSERT_TRUE(sys_signame[0] == NULL); ASSERT_TRUE(sys_signame[0] == NULL);
ASSERT_STREQ("HUP", sys_signame[SIGHUP]); ASSERT_STREQ("HUP", sys_signame[SIGHUP]);
#else #else