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

am fd10c019: am 09c33824: Merge "Break two incorrect transitive includes."

Browse Source 
* commit 'fd10c019fab50c06f391b6a765b0904ce477d3b7':
  Break two incorrect transitive includes.
This commit is contained in:
Elliott Hughes
2015-01-31 07:49:24 +00:00
committed by Android Git Automerger
parent 3c68e1946a fd10c019fa
commit a26423f22c
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libc/include/string.h
View File

@@ -31,7 +31,6 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <stddef.h> #include <stddef.h>
#include <malloc.h>
#include <xlocale.h> #include <xlocale.h>
__BEGIN_DECLS __BEGIN_DECLS

10
libc/include/sys/select.h
View File

@@ -31,7 +31,6 @@
#include <linux/time.h> #include <linux/time.h>
#include <signal.h> #include <signal.h>
#include <string.h>
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
@@ -49,7 +48,14 @@ typedef struct {
#define __FDMASK(fd) (1UL << ((fd) % NFDBITS)) #define __FDMASK(fd) (1UL << ((fd) % NFDBITS))
#define __FDS_BITS(set) (((fd_set*)(set))->fds_bits) #define __FDS_BITS(set) (((fd_set*)(set))->fds_bits)
#define FD_ZERO(set) (memset(set, 0, sizeof(*(fd_set*)(set)))) /* Inline loop so we don't have to declare memset. */
#define FD_ZERO(set) \
do { \
size_t __i; \
for (__i = 0; __i < __FDSET_LONGS; ++__i) { \
(set)->fds_bits[__i] = 0; \
} \
} while (0)
extern void __FD_CLR_chk(int, fd_set*, size_t); extern void __FD_CLR_chk(int, fd_set*, size_t);
extern void __FD_SET_chk(int, fd_set*, size_t); extern void __FD_SET_chk(int, fd_set*, size_t);