diff options
author | Jesse Hall <jessehall@google.com> | 2012-07-23 10:13:06 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-23 10:13:06 -0700 |
commit | d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6 (patch) | |
tree | b39ee901bb528b7e3593117cde724ef75d438b67 /distrib/sdl-1.2.15/include/SDL_syswm.h | |
parent | 2b3a42e7d0b441f71fc2e2b07269dd1f8151c977 (diff) | |
parent | e4c5d95ed37611acc6a186522315195b4ebfb9ef (diff) | |
download | external_qemu-d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6.zip external_qemu-d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6.tar.gz external_qemu-d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6.tar.bz2 |
Merge "Apply Android changes from sdl-1.2.12 to sdl-1.2.15"
Diffstat (limited to 'distrib/sdl-1.2.15/include/SDL_syswm.h')
-rw-r--r-- | distrib/sdl-1.2.15/include/SDL_syswm.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/distrib/sdl-1.2.15/include/SDL_syswm.h b/distrib/sdl-1.2.15/include/SDL_syswm.h index 78433c6..771d6b1 100644 --- a/distrib/sdl-1.2.15/include/SDL_syswm.h +++ b/distrib/sdl-1.2.15/include/SDL_syswm.h @@ -181,6 +181,18 @@ typedef struct SDL_SysWMinfo { int data; } SDL_SysWMinfo; +#elif defined(SDL_VIDEO_DRIVER_QUARTZ) + +struct SDL_SysWMmsg { + SDL_version version; + int data; +}; + +typedef struct SDL_SysWMinfo { + SDL_version version; + void* nsWindowPtr; +} SDL_SysWMinfo; + #else /** The generic custom event structure */ |