diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-10-23 15:33:46 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-10-23 15:33:46 -0700 |
| commit | aee12b961de382268e54a52fdfe397b04f5f57de (patch) | |
| tree | 3f68cbfc76f4ef23a154cc732564d0f222b56236 | |
| parent | 0e0ad51a8dc8d692b7c7b08da91b95c357cbfcb4 (diff) | |
| parent | cbdb76d46c0c2605ba426ba86fd322f3c2393f9b (diff) | |
Merge pull request #101 from BenoitT/master
Fixed ios compilation problem
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | system/include/libc/_ansi.h | 2 | ||||
| -rw-r--r-- | system/include/libc/sys/unistd.h | 4 | ||||
| -rw-r--r-- | system/include/libcxx/ios | 8 |
4 files changed, 8 insertions, 7 deletions
@@ -6,3 +6,4 @@ under the licensing terms detailed in LICENSE. * Max Shawabkeh <max99x@gmail.com> * Sigmund Vik <sigmund_vik@yahoo.com> * Jeff Terrace <jterrace@gmail.com> +* Benoit Tremblay <benoit.tremblay@frimastudio.com>
\ No newline at end of file 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 diff --git a/system/include/libcxx/ios b/system/include/libcxx/ios index e2f2b6fd..29bda558 100644 --- a/system/include/libcxx/ios +++ b/system/include/libcxx/ios @@ -317,7 +317,7 @@ public: _LIBCPP_INLINE_VISIBILITY bool bad() const; _LIBCPP_INLINE_VISIBILITY iostate exceptions() const; - _LIBCPP_INLINE_VISIBILITY void exceptions(iostate __except); + _LIBCPP_INLINE_VISIBILITY void exceptions(iostate except); /* XXX Emscripten: renammed __except to except because it is a reserved keyword */ void __set_badbit_and_consider_rethrow(); void __set_failbit_and_consider_rethrow(); @@ -553,9 +553,9 @@ ios_base::exceptions() const inline _LIBCPP_INLINE_VISIBILITY void -ios_base::exceptions(iostate __except) +ios_base::exceptions(iostate except) /* XXX Emscripten: renammed __except to except because it is a reserved keyword */ { - __exceptions_ = __except; + __exceptions_ = except; /* XXX Emscripten: renammed __except to except because it is a reserved keyword */ clear(__rdstate_); } @@ -584,7 +584,7 @@ public: _LIBCPP_ALWAYS_INLINE bool bad() const {return ios_base::bad();} _LIBCPP_ALWAYS_INLINE iostate exceptions() const {return ios_base::exceptions();} - _LIBCPP_ALWAYS_INLINE void exceptions(iostate __except) {ios_base::exceptions(__except);} + _LIBCPP_ALWAYS_INLINE void exceptions(iostate except) {ios_base::exceptions(except);} /* XXX Emscripten: renammed __except to except because it is a reserved keyword */ // 27.5.4.1 Constructor/destructor: _LIBCPP_INLINE_VISIBILITY |