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/include/SDL/SDL_surface.h | |
parent | e77d99dac0b1ba58c773b4b8c7d8a223ad008624 (diff) | |
parent | 47bc8ba2c47c67d8824c2b7bf35195a079cbed7c (diff) |
Merge branch 'incoming'
Diffstat (limited to 'system/include/SDL/SDL_surface.h')
-rw-r--r-- | system/include/SDL/SDL_surface.h | 4 |
1 files changed, 3 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. |