diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-12-18 07:59:06 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-12-18 07:59:06 -0800 |
| commit | 56b65a54cb92d2d4a34535f71dbae08d758d3fc3 (patch) | |
| tree | 0220d27388eab38587a8fd12140552e0ce513435 /system | |
| parent | e77d99dac0b1ba58c773b4b8c7d8a223ad008624 (diff) | |
| parent | 47bc8ba2c47c67d8824c2b7bf35195a079cbed7c (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'system')
| -rw-r--r-- | system/include/SDL/SDL_surface.h | 4 | ||||
| -rw-r--r-- | system/include/libcxx/ostream | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/system/include/SDL/SDL_surface.h b/system/include/SDL/SDL_surface.h index 77b58258..ecf89606 100644 --- a/system/include/SDL/SDL_surface.h +++ b/system/include/SDL/SDL_surface.h @@ -59,7 +59,9 @@ extern "C" { /** * Evaluates to true if the surface needs to be locked before access. */ -#define SDL_MUSTLOCK(S) (((S)->flags & SDL_RLEACCEL) != 0) +#define SDL_MUSTLOCK(S) 1 + /* XXX Emscripten: we always need to lock. + (((S)->flags & SDL_RLEACCEL) != 0) */ /** * \brief A collection of pixels used in software blitting. diff --git a/system/include/libcxx/ostream b/system/include/libcxx/ostream index dd28e686..f7cbb8a2 100644 --- a/system/include/libcxx/ostream +++ b/system/include/libcxx/ostream @@ -1181,6 +1181,7 @@ basic_ostream<_CharT, _Traits>::seekp(off_type __off, ios_base::seekdir __dir) return *this; } +*/ template <class _CharT, class _Traits> inline _LIBCPP_INLINE_VISIBILITY basic_ostream<_CharT, _Traits>& @@ -1209,6 +1210,7 @@ flush(basic_ostream<_CharT, _Traits>& __os) return __os; } +/* #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES template <class _Stream, class _Tp> |