summaryrefslogtreecommitdiffstats
path: root/libc/unistd
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-11-09 08:04:48 -0800
committerJean-Baptiste Queru <jbq@google.com>2009-11-09 08:04:48 -0800
commit83362689f5b1f6393d376d242fe29541b63ead2d (patch)
tree729a4fc7fd44630738510d1477e968cb7ec0fa3f /libc/unistd
parentecac54db21256952b4b4a9c6f17604ec31743183 (diff)
parentad13c57298e57d33c130fb03a2c6494da573408c (diff)
downloadbionic-83362689f5b1f6393d376d242fe29541b63ead2d.zip
bionic-83362689f5b1f6393d376d242fe29541b63ead2d.tar.gz
bionic-83362689f5b1f6393d376d242fe29541b63ead2d.tar.bz2
merge from open-source master
Diffstat (limited to 'libc/unistd')
-rw-r--r--libc/unistd/siglist.c2
-rw-r--r--libc/unistd/signame.c33
2 files changed, 34 insertions, 1 deletions
diff --git a/libc/unistd/siglist.c b/libc/unistd/siglist.c
index a2ac9fe..f1c3377 100644
--- a/libc/unistd/siglist.c
+++ b/libc/unistd/siglist.c
@@ -28,6 +28,6 @@
#include <signal.h>
const char * const sys_siglist[NSIG] = {
-#define __BIONIC_SIGDEF(x,y,z) [ x ] = z,
+#define __BIONIC_SIGDEF(x,y,z) [ SIG##x ] = z,
#include <sys/_sigdefs.h>
};
diff --git a/libc/unistd/signame.c b/libc/unistd/signame.c
new file mode 100644
index 0000000..4611e44
--- /dev/null
+++ b/libc/unistd/signame.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <signal.h>
+
+const char * const sys_signame[NSIG] = {
+#define __BIONIC_SIGDEF(x,y,z) [ SIG##x ] = #x,
+#include <sys/_sigdefs.h>
+};