diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 12:55:33 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-04-01 12:55:33 -0700 |
| commit | 8408257cd66435af849f493c10c7f0e8d1d5fa3b (patch) | |
| tree | 8b05963e8608b22f71620f512679d7cd5b1de548 /system/include/libc/sys | |
| parent | a8e4801c7d38033fff760ea26a4579aa324e303e (diff) | |
| parent | 36600f34ef0ec2cf75165be3753567e256f514db (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'system/include/libc/sys')
| -rw-r--r-- | system/include/libc/sys/resource.h | 8 | ||||
| -rw-r--r-- | system/include/libc/sys/unistd.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/system/include/libc/sys/resource.h b/system/include/libc/sys/resource.h index abcfd34d..1e451e0d 100644 --- a/system/include/libc/sys/resource.h +++ b/system/include/libc/sys/resource.h @@ -3,6 +3,10 @@ #include <sys/time.h> +#ifdef __cplusplus +extern "C" { +#endif + #define RUSAGE_SELF 0 /* calling process */ #define RUSAGE_CHILDREN -1 /* terminated child processes */ @@ -47,5 +51,9 @@ struct rlimit { int getrlimit(int resource, struct rlimit *rlim); int setrlimit(int resource, const struct rlimit *rlim); +#ifdef __cplusplus +} +#endif + #endif diff --git a/system/include/libc/sys/unistd.h b/system/include/libc/sys/unistd.h index 082c5e4d..b0c6d505 100644 --- a/system/include/libc/sys/unistd.h +++ b/system/include/libc/sys/unistd.h @@ -14,7 +14,7 @@ extern "C" { extern char **environ; -void _EXFUN(_exit, (int __status )); /* _ATTRIBUTE ((noreturn))); */ +void _EXFUN(_exit, (int __status ) _ATTRIBUTE(noreturn)); int _EXFUN(access,(const char *__path, int __amode )); unsigned _EXFUN(alarm, (unsigned __secs )); |