aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2014-12-29 15:29:50 -0600
committerElliott Hughes2014-12-29 15:29:50 -0600
commit40360b379cee07574493f5a450cf1c6e531bdde0 (patch)
tree2b16a06dc25f1c3f51e94dc099513464f615e622
parent0a552407ada6fc718be016df0902f6c23aa88eea (diff)
downloadplatform-bionic-40360b379cee07574493f5a450cf1c6e531bdde0.tar.gz
platform-bionic-40360b379cee07574493f5a450cf1c6e531bdde0.tar.xz
platform-bionic-40360b379cee07574493f5a450cf1c6e531bdde0.zip
Remove bogus transitive includes.
<signal.h> shouldn't get you the contents of <errno.h>, and <fcntl.h> shouldn't get you the contents of <unistd.h>. Change-Id: I347499cd8671bfee98e6b8e875a97cab3a3655d3
-rw-r--r--libc/bionic/bionic_systrace.cpp1
-rw-r--r--libc/bionic/chown.cpp1
-rw-r--r--libc/bionic/lchown.cpp1
-rw-r--r--libc/bionic/poll.cpp1
-rw-r--r--libc/bionic/raise.cpp1
-rw-r--r--libc/bionic/readlink.cpp1
-rw-r--r--libc/bionic/sigaddset.cpp1
-rw-r--r--libc/bionic/sigdelset.cpp1
-rw-r--r--libc/bionic/sigemptyset.cpp1
-rw-r--r--libc/bionic/sigfillset.cpp1
-rw-r--r--libc/bionic/sigismember.cpp1
-rw-r--r--libc/bionic/termios.cpp1
-rw-r--r--libc/bionic/utimes.cpp1
-rw-r--r--libc/include/fcntl.h1
-rw-r--r--libc/include/signal.h1
-rw-r--r--libc/upstream-netbsd/android/include/fd_setsize.h1
16 files changed, 14 insertions, 2 deletions
diff --git a/libc/bionic/bionic_systrace.cpp b/libc/bionic/bionic_systrace.cpp
index f5be4155..c74a52c0 100644
--- a/libc/bionic/bionic_systrace.cpp
+++ b/libc/bionic/bionic_systrace.cpp
@@ -15,6 +15,7 @@
15 */ 15 */
16 16
17#include <cutils/trace.h> 17#include <cutils/trace.h>
18#include <errno.h>
18#include <fcntl.h> 19#include <fcntl.h>
19#include <stdio.h> 20#include <stdio.h>
20#include <stdlib.h> 21#include <stdlib.h>
diff --git a/libc/bionic/chown.cpp b/libc/bionic/chown.cpp
index bc2e6054..dce16736 100644
--- a/libc/bionic/chown.cpp
+++ b/libc/bionic/chown.cpp
@@ -29,6 +29,7 @@
29#include <fcntl.h> 29#include <fcntl.h>
30#include <sys/stat.h> 30#include <sys/stat.h>
31#include <sys/types.h> 31#include <sys/types.h>
32#include <unistd.h>
32 33
33int chown(const char* path, uid_t uid, gid_t gid) { 34int chown(const char* path, uid_t uid, gid_t gid) {
34 return fchownat(AT_FDCWD, path, uid, gid, 0); 35 return fchownat(AT_FDCWD, path, uid, gid, 0);
diff --git a/libc/bionic/lchown.cpp b/libc/bionic/lchown.cpp
index 95251db0..24611a5b 100644
--- a/libc/bionic/lchown.cpp
+++ b/libc/bionic/lchown.cpp
@@ -29,6 +29,7 @@
29#include <fcntl.h> 29#include <fcntl.h>
30#include <sys/stat.h> 30#include <sys/stat.h>
31#include <sys/types.h> 31#include <sys/types.h>
32#include <unistd.h>
32 33
33int lchown(const char* path, uid_t uid, gid_t gid) { 34int lchown(const char* path, uid_t uid, gid_t gid) {
34 return fchownat(AT_FDCWD, path, uid, gid, AT_SYMLINK_NOFOLLOW); 35 return fchownat(AT_FDCWD, path, uid, gid, AT_SYMLINK_NOFOLLOW);
diff --git a/libc/bionic/poll.cpp b/libc/bionic/poll.cpp
index ebb318d9..d267229b 100644
--- a/libc/bionic/poll.cpp
+++ b/libc/bionic/poll.cpp
@@ -26,6 +26,7 @@
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <errno.h>
29#include <sys/poll.h> 30#include <sys/poll.h>
30#include <sys/select.h> 31#include <sys/select.h>
31 32
diff --git a/libc/bionic/raise.cpp b/libc/bionic/raise.cpp
index 0dd0ad7b..b134b5af 100644
--- a/libc/bionic/raise.cpp
+++ b/libc/bionic/raise.cpp
@@ -26,6 +26,7 @@
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <errno.h>
29#include <pthread.h> 30#include <pthread.h>
30#include <signal.h> 31#include <signal.h>
31 32
diff --git a/libc/bionic/readlink.cpp b/libc/bionic/readlink.cpp
index a2c5e91a..3bb7bc18 100644
--- a/libc/bionic/readlink.cpp
+++ b/libc/bionic/readlink.cpp
@@ -29,6 +29,7 @@
29#include <fcntl.h> 29#include <fcntl.h>
30#include <sys/stat.h> 30#include <sys/stat.h>
31#include <sys/types.h> 31#include <sys/types.h>
32#include <unistd.h>
32 33
33ssize_t readlink(const char* path, char* buf, size_t size) { 34ssize_t readlink(const char* path, char* buf, size_t size) {
34 return readlinkat(AT_FDCWD, path, buf, size); 35 return readlinkat(AT_FDCWD, path, buf, size);
diff --git a/libc/bionic/sigaddset.cpp b/libc/bionic/sigaddset.cpp
index 33ec6f84..6ade3b12 100644
--- a/libc/bionic/sigaddset.cpp
+++ b/libc/bionic/sigaddset.cpp
@@ -26,6 +26,7 @@
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <errno.h>
29#include <signal.h> 30#include <signal.h>
30 31
31int sigaddset(sigset_t* set, int signum) { 32int sigaddset(sigset_t* set, int signum) {
diff --git a/libc/bionic/sigdelset.cpp b/libc/bionic/sigdelset.cpp
index 9eea2506..3582f0d4 100644
--- a/libc/bionic/sigdelset.cpp
+++ b/libc/bionic/sigdelset.cpp
@@ -26,6 +26,7 @@
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <errno.h>
29#include <signal.h> 30#include <signal.h>
30 31
31int sigdelset(sigset_t* set, int signum) { 32int sigdelset(sigset_t* set, int signum) {
diff --git a/libc/bionic/sigemptyset.cpp b/libc/bionic/sigemptyset.cpp
index 29931690..8d8033f9 100644
--- a/libc/bionic/sigemptyset.cpp
+++ b/libc/bionic/sigemptyset.cpp
@@ -26,6 +26,7 @@
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <errno.h>
29#include <signal.h> 30#include <signal.h>
30 31
31int sigemptyset(sigset_t* set) { 32int sigemptyset(sigset_t* set) {
diff --git a/libc/bionic/sigfillset.cpp b/libc/bionic/sigfillset.cpp
index 7b7cbb83..37792e55 100644
--- a/libc/bionic/sigfillset.cpp
+++ b/libc/bionic/sigfillset.cpp
@@ -26,6 +26,7 @@
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <errno.h>
29#include <signal.h> 30#include <signal.h>
30 31
31int sigfillset(sigset_t* set) { 32int sigfillset(sigset_t* set) {
diff --git a/libc/bionic/sigismember.cpp b/libc/bionic/sigismember.cpp
index 0dc73ace..16acd098 100644
--- a/libc/bionic/sigismember.cpp
+++ b/libc/bionic/sigismember.cpp
@@ -26,6 +26,7 @@
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <errno.h>
29#include <signal.h> 30#include <signal.h>
30 31
31int sigismember(const sigset_t* set, int signum) { 32int sigismember(const sigset_t* set, int signum) {
diff --git a/libc/bionic/termios.cpp b/libc/bionic/termios.cpp
index 082dcdc8..44ae6435 100644
--- a/libc/bionic/termios.cpp
+++ b/libc/bionic/termios.cpp
@@ -26,6 +26,7 @@
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <errno.h>
29#include <termios.h> 30#include <termios.h>
30#include <unistd.h> 31#include <unistd.h>
31 32
diff --git a/libc/bionic/utimes.cpp b/libc/bionic/utimes.cpp
index 65f2d0b7..0b66e6cb 100644
--- a/libc/bionic/utimes.cpp
+++ b/libc/bionic/utimes.cpp
@@ -26,6 +26,7 @@
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <errno.h>
29#include <fcntl.h> 30#include <fcntl.h>
30#include <sys/stat.h> 31#include <sys/stat.h>
31#include <sys/time.h> 32#include <sys/time.h>
diff --git a/libc/include/fcntl.h b/libc/include/fcntl.h
index b18ab121..4c4cfbd7 100644
--- a/libc/include/fcntl.h
+++ b/libc/include/fcntl.h
@@ -35,7 +35,6 @@
35#include <linux/fcntl.h> 35#include <linux/fcntl.h>
36#include <linux/stat.h> 36#include <linux/stat.h>
37#include <linux/uio.h> 37#include <linux/uio.h>
38#include <unistd.h> /* this is not required, but makes client code much happier */
39 38
40__BEGIN_DECLS 39__BEGIN_DECLS
41 40
diff --git a/libc/include/signal.h b/libc/include/signal.h
index 9519f6d0..89888880 100644
--- a/libc/include/signal.h
+++ b/libc/include/signal.h
@@ -30,7 +30,6 @@
30#define _SIGNAL_H_ 30#define _SIGNAL_H_
31 31
32#include <asm/sigcontext.h> 32#include <asm/sigcontext.h>
33#include <errno.h>
34#include <limits.h> 33#include <limits.h>
35#include <machine/pthread_types.h> 34#include <machine/pthread_types.h>
36#include <machine/timespec.h> 35#include <machine/timespec.h>
diff --git a/libc/upstream-netbsd/android/include/fd_setsize.h b/libc/upstream-netbsd/android/include/fd_setsize.h
index e69de29b..41bfcb71 100644
--- a/libc/upstream-netbsd/android/include/fd_setsize.h
+++ b/libc/upstream-netbsd/android/include/fd_setsize.h
@@ -0,0 +1 @@
#include <sys/select.h>