  #if SDL_VIDEO_DRIVER_QUARTZ
  	&QZ_bootstrap,
  #endif
-diff -urN SDL-1.2.14/src/video/nacl/SDL_naclevents.cc SDL-1.2.14-nacl/src/video/nacl/SDL_naclevents.cc
---- SDL-1.2.14/src/video/nacl/SDL_naclevents.cc	1970-01-01 03:00:00.000000000 +0300
-+++ SDL-1.2.14-nacl/src/video/nacl/SDL_naclevents.cc	2011-05-27 12:35:37.284169164 +0400
-@@ -0,0 +1,151 @@
+diff -Naur temp_SDL-1.2.14/SDL-1.2.14/src/video/nacl/SDL_naclevents.cc SDL-1.2.14/src/video/nacl/SDL_naclevents.cc
+--- temp_SDL-1.2.14/SDL-1.2.14/src/video/nacl/SDL_naclevents.cc	1969-12-31 16:00:00.000000000 -0800
++++ SDL-1.2.14/src/video/nacl/SDL_naclevents.cc	2011-07-29 16:20:18.000000000 -0700
+@@ -0,0 +1,176 @@
 +#include "SDL_config.h"
++
++#include "SDL_nacl.h"
 +
 +extern "C" {
 +#include "SDL.h"
-+#include "SDL_nacl.h"
 +#include "../../events/SDL_sysevents.h"
 +#include "../../events/SDL_events_c.h"
 +}
 +
 +#include "SDL_naclevents_c.h"
 +#include "eventqueue.h"
++#include <ppapi/cpp/input_event.h>
++#include <ppapi/cpp/point.h>
 +
 +static EventQueue event_queue;
 +
-+void SDL_NACL_PushEvent(const PP_InputEvent* ppevent) {
-+  PP_InputEvent* copy = (PP_InputEvent*)malloc(sizeof(PP_InputEvent));
-+  memcpy(copy, ppevent, sizeof(PP_InputEvent));
-+  event_queue.PushEvent(copy);
-+}
++struct SDL_NACL_Event {
++  PP_InputEvent_Type type;
++  Uint8 button;
++  SDL_keysym keysym;
++  int32_t x, y;
++};
 +
 +static Uint8 translateButton(int32_t button) {
 +  switch (button) {

+
+#include <queue>
+#include <ppapi/c/pp_input_event.h>
+
+class EventQueue {
+public:

     *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-irix*|*-*-aix*|*-*-osf*)
         case "$host" in
             *-*-linux*)         ARCH=linux ;;
diff -Naur temp_SDL-1.2.14/SDL-1.2.14/include/SDL_config.h.in SDL-1.2.14/include/SDL_config.h.in
--- temp_SDL-1.2.14/SDL-1.2.14/include/SDL_config.h.in	2011-07-27 15:53:38.000000000 -0700
+++ SDL-1.2.14/include/SDL_config.h.in	2011-07-27 15:59:13.000000000 -0700
@@ -174,6 +174,7 @@
 #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC
 #undef SDL_AUDIO_DRIVER_MINT
