diff options
| author | David Turner <digit@google.com> | 2010-02-09 14:50:57 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-09 14:50:57 -0800 |
| commit | 16f7d16f9f0273bed58f5e8c74eb0ee11eaa8037 (patch) | |
| tree | 071921aedb913150ef86d6840869371ff922aab1 | |
| parent | 53691d7df295eed54742365db1180367e26770f5 (diff) | |
| parent | 49f0a8f23bba188466c6ee3652858ef4da228c6f (diff) | |
| download | bionic-16f7d16f9f0273bed58f5e8c74eb0ee11eaa8037.tar.gz bionic-16f7d16f9f0273bed58f5e8c74eb0ee11eaa8037.tar.bz2 bionic-16f7d16f9f0273bed58f5e8c74eb0ee11eaa8037.zip | |
Merge "Fix <sys/epoll.h> and <sys/system_properties.h> to include proper C++ inclusion guards"
| -rw-r--r-- | libc/include/sys/epoll.h | 6 | ||||
| -rw-r--r-- | libc/include/sys/system_properties.h | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libc/include/sys/epoll.h b/libc/include/sys/epoll.h index 1478caa6c..decdb4649 100644 --- a/libc/include/sys/epoll.h +++ b/libc/include/sys/epoll.h @@ -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_ */ diff --git a/libc/include/sys/system_properties.h b/libc/include/sys/system_properties.h index 2eb00cdc0..4fdc9447f 100644 --- a/libc/include/sys/system_properties.h +++ b/libc/include/sys/system_properties.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 |