 +    SDL_DestroyMutex(mu_);
 +  }
 +
-+  PP_InputEvent* PopEvent() {
++  SDL_NACL_Event* PopEvent() {
 +    SDL_LockMutex(mu_);
-+    PP_InputEvent* event = NULL;
++    SDL_NACL_Event* event = NULL;
 +    if (!queue_.empty()) {
 +      event = queue_.front();
 +      queue_.pop();

+};
+
+#endif /* _SDL_naclaudio_h */
diff -urN SDL-1.2.14/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.14-nacl/src/cpuinfo/SDL_cpuinfo.c
--- SDL-1.2.14/src/cpuinfo/SDL_cpuinfo.c	2009-10-13 03:07:14.000000000 +0400
+++ SDL-1.2.14-nacl/src/cpuinfo/SDL_cpuinfo.c	2011-05-27 12:35:37.274169187 +0400
@@ -53,6 +53,8 @@
 }
 #endif /* HAVE_SETJMP */

 #if SDL_AUDIO_DRIVER_DISK
 extern AudioBootStrap DISKAUD_bootstrap;
 #endif
diff -Naur temp_SDL-1.2.14/SDL-1.2.14/src/audio/nacl/SDL_naclaudio.cc SDL-1.2.14/src/audio/nacl/SDL_naclaudio.cc
--- temp_SDL-1.2.14/SDL-1.2.14/src/audio/nacl/SDL_naclaudio.cc	1969-12-31 16:00:00.000000000 -0800
+++ SDL-1.2.14/src/audio/nacl/SDL_naclaudio.cc	2011-07-27 15:59:13.000000000 -0700
@@ -0,0 +1,133 @@
+
+#include "SDL_config.h"
