aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-24 22:34:51 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-24 22:34:51 +0000
commit62d20fb21948d7a31d453ec08ed5abc02d3dd1d3 (patch)
tree6b6def69d3527330496182d551d8e7910de38a39
parent6e15edcca5f5b35221b33e9994c236f148cb3c38 (diff)
parent6466292a7e47f3adfeb6721cf16e6b78b1c76625 (diff)
downloadandroid_bionic-62d20fb21948d7a31d453ec08ed5abc02d3dd1d3.tar.gz
android_bionic-62d20fb21948d7a31d453ec08ed5abc02d3dd1d3.tar.bz2
android_bionic-62d20fb21948d7a31d453ec08ed5abc02d3dd1d3.zip
Merge "Reduce <signal.h> namespace pollution."
-rw-r--r--libc/bionic/sigemptyset.cpp1
-rw-r--r--libc/bionic/sigfillset.cpp1
-rw-r--r--libc/include/signal.h1
3 files changed, 2 insertions, 1 deletions
diff --git a/libc/bionic/sigemptyset.cpp b/libc/bionic/sigemptyset.cpp
index 8d8033f99..58166a1a9 100644
--- a/libc/bionic/sigemptyset.cpp
+++ b/libc/bionic/sigemptyset.cpp
@@ -28,6 +28,7 @@
#include <errno.h>
#include <signal.h>
+#include <string.h>
int sigemptyset(sigset_t* set) {
if (set == NULL) {
diff --git a/libc/bionic/sigfillset.cpp b/libc/bionic/sigfillset.cpp
index 37792e55b..cb673942e 100644
--- a/libc/bionic/sigfillset.cpp
+++ b/libc/bionic/sigfillset.cpp
@@ -28,6 +28,7 @@
#include <errno.h>
#include <signal.h>
+#include <string.h>
int sigfillset(sigset_t* set) {
if (set == NULL) {
diff --git a/libc/include/signal.h b/libc/include/signal.h
index 898888809..39d37e9cb 100644
--- a/libc/include/signal.h
+++ b/libc/include/signal.h
@@ -33,7 +33,6 @@
#include <limits.h>
#include <machine/pthread_types.h>
#include <machine/timespec.h>
-#include <string.h>
#include <sys/cdefs.h>
#include <sys/types.h>