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

Merge "Fix <sys/epoll.h> and <sys/system_properties.h> to include proper C++ inclusion guards"

Browse Source
This commit is contained in:
David Turner 2010-02-09 14:50:57 -08:00 committed by Android (Google) Code Review
commit 16f7d16f9f
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/include/sys/epoll.h
View File

@ -28,6 +28,10 @@
#ifndef _SYS_EPOLL_H_ #ifndef _SYS_EPOLL_H_
#define _SYS_EPOLL_H_ #define _SYS_EPOLL_H_
#include <sys/cdefs.h>
__BEGIN_DECLS
#define EPOLLIN 0x00000001 #define EPOLLIN 0x00000001
#define EPOLLPRI 0x00000002 #define EPOLLPRI 0x00000002
#define EPOLLOUT 0x00000004 #define EPOLLOUT 0x00000004
@ -62,5 +66,7 @@ int epoll_create(int size);
int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event); int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event);
int epoll_wait(int epfd, struct epoll_event *events, int max, int timeout); int epoll_wait(int epfd, struct epoll_event *events, int max, int timeout);
__END_DECLS
#endif /* _SYS_EPOLL_H_ */ #endif /* _SYS_EPOLL_H_ */

6
libc/include/sys/system_properties.h
View File

@ -29,6 +29,10 @@
#ifndef _INCLUDE_SYS_SYSTEM_PROPERTIES_H #ifndef _INCLUDE_SYS_SYSTEM_PROPERTIES_H
#define _INCLUDE_SYS_SYSTEM_PROPERTIES_H #define _INCLUDE_SYS_SYSTEM_PROPERTIES_H
#include <sys/cdefs.h>
__BEGIN_DECLS
typedef struct prop_info prop_info; typedef struct prop_info prop_info;
#define PROP_NAME_MAX 32 #define PROP_NAME_MAX 32
@ -76,4 +80,6 @@ int __system_property_read(const prop_info *pi, char *name, char *value);
*/ */
const prop_info *__system_property_find_nth(unsigned n); const prop_info *__system_property_find_nth(unsigned n);
__END_DECLS
#endif #endif