Emscripten: use UTF8ToString instead of Pointer_stringify
authorCharlie Birks <charlie@daftgames.net>
Tue, 29 Jan 2019 12:19:03 +0000
changeset 125768d61748ac590
parent 12575 62f907f026bb
child 12577 32d2fe2bc966
Emscripten: use UTF8ToString instead of Pointer_stringify
src/SDL_assert.c
src/video/emscripten/SDL_emscriptenmouse.c
src/video/emscripten/SDL_emscriptenvideo.c
     1.1 --- a/src/SDL_assert.c	Tue Jan 29 12:19:00 2019 +0000
     1.2 +++ b/src/SDL_assert.c	Tue Jan 29 12:19:03 2019 +0000
     1.3 @@ -250,7 +250,7 @@
     1.4              SDL_bool okay = SDL_TRUE;
     1.5              char *buf = (char *) EM_ASM_INT({
     1.6                  var str =
     1.7 -                    Pointer_stringify($0) + '\n\n' +
     1.8 +                    UTF8ToString($0) + '\n\n' +
     1.9                      'Abort/Retry/Ignore/AlwaysIgnore? [ariA] :';
    1.10                  var reply = window.prompt(str, "i");
    1.11                  if (reply === null) {
     2.1 --- a/src/video/emscripten/SDL_emscriptenmouse.c	Tue Jan 29 12:19:00 2019 +0000
     2.2 +++ b/src/video/emscripten/SDL_emscriptenmouse.c	Tue Jan 29 12:19:03 2019 +0000
     2.3 @@ -210,7 +210,7 @@
     2.4              if(curdata->system_cursor) {
     2.5                  EM_ASM_INT({
     2.6                      if (Module['canvas']) {
     2.7 -                        Module['canvas'].style['cursor'] = Module['Pointer_stringify']($0);
     2.8 +                        Module['canvas'].style['cursor'] = UTF8ToString($0);
     2.9                      }
    2.10                      return 0;
    2.11                  }, curdata->system_cursor);
     3.1 --- a/src/video/emscripten/SDL_emscriptenvideo.c	Tue Jan 29 12:19:00 2019 +0000
     3.2 +++ b/src/video/emscripten/SDL_emscriptenvideo.c	Tue Jan 29 12:19:03 2019 +0000
     3.3 @@ -344,7 +344,7 @@
     3.4  Emscripten_SetWindowTitle(_THIS, SDL_Window * window) {
     3.5      EM_ASM_INT({
     3.6        if (typeof Module['setWindowTitle'] !== 'undefined') {
     3.7 -        Module['setWindowTitle'](Module['Pointer_stringify']($0));
     3.8 +        Module['setWindowTitle'](UTF8ToString($0));
     3.9        }
    3.10        return 0;
    3.11      }, window->title);