diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-10-24 19:53:58 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-10-24 19:53:58 -0700 |
| commit | d259c5e17e7727806f2e54c6ffcdce1eec752ade (patch) | |
| tree | d12082c3f09bd822627404406006fa33d6260b4c /system/include/libc | |
| parent | 160c0621603a3abc99d936d0216e84862583338a (diff) | |
| parent | aee12b961de382268e54a52fdfe397b04f5f57de (diff) | |
Merge branch 'master' of https://github.com/kripken/emscripten
Diffstat (limited to 'system/include/libc')
| -rw-r--r-- | system/include/libc/_ansi.h | 2 | ||||
| -rw-r--r-- | system/include/libc/sys/unistd.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/system/include/libc/_ansi.h b/system/include/libc/_ansi.h index e584ec38..8548e0fe 100644 --- a/system/include/libc/_ansi.h +++ b/system/include/libc/_ansi.h @@ -103,11 +103,13 @@ /* Support gcc's __attribute__ facility. */ +#ifndef _ATTRIBUTE /* XXX Emscripten */ #ifdef __GNUC__ #define _ATTRIBUTE(attrs) __attribute__ (attrs) #else #define _ATTRIBUTE(attrs) #endif +#endif /* XXX Emscripten */ /* The traditional meaning of 'extern inline' for GCC is not to emit the function body unless the address is explicitly diff --git a/system/include/libc/sys/unistd.h b/system/include/libc/sys/unistd.h index a4110144..06259b66 100644 --- a/system/include/libc/sys/unistd.h +++ b/system/include/libc/sys/unistd.h @@ -302,7 +302,7 @@ int _EXFUN(unlinkat, (int, const char *, int)); #define _SC_PRIORITIZED_IO 28 #define _SC_REALTIME_SIGNALS 29 #define _SC_SEMAPHORES 30 -#define _SC_SHARED_MEMORY_OBJECTS 31 +#define _SC_SHARED_MEMORY_OBJECTS 199 /* XXX Emscripten changed 31 to 199 */ #define _SC_SYNCHRONIZED_IO 32 #define _SC_TIMERS 33 #define _SC_AIO_LISTIO_MAX 34 @@ -406,8 +406,6 @@ int _EXFUN(unlinkat, (int, const char *, int)); #define _SC_THREAD_ROBUST_PRIO_INHERIT 122 #define _SC_THREAD_ROBUST_PRIO_PROTECT 123 #define _SC_XOPEN_UUCP 124 -/* XXX Emscripten */ -#define _SC_SHARED_MEMORY_OBJECTS 199 /* * pathconf values per IEEE Std 1003.1, 2008 Edition |