Merge "Fix <sys/epoll.h> and <sys/system_properties.h> to include proper C++ inclusion guards"
This commit is contained in:
commit
16f7d16f9f
@ -28,6 +28,10 @@
|
||||
#ifndef _SYS_EPOLL_H_
|
||||
#define _SYS_EPOLL_H_
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
#define EPOLLIN 0x00000001
|
||||
#define EPOLLPRI 0x00000002
|
||||
#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_wait(int epfd, struct epoll_event *events, int max, int timeout);
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* _SYS_EPOLL_H_ */
|
||||
|
||||
|
@ -29,6 +29,10 @@
|
||||
#ifndef _INCLUDE_SYS_SYSTEM_PROPERTIES_H
|
||||
#define _INCLUDE_SYS_SYSTEM_PROPERTIES_H
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
typedef struct prop_info prop_info;
|
||||
|
||||
#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);
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user