WinRT: merged with latest SDL 2.x/HG code

SDL 2.x recently accepted patches to enable OpenGL ES 2 support via Google's ANGLE library.  The thought is to try to eventually merge SDL/WinRT's OpenGL code with SDL-official's.

src/timer/haiku/SDL_systimer.c

@@ -20,9 +20,9 @@
 */
 #include "SDL_config.h"
 
-#ifdef SDL_TIMER_BEOS
+#ifdef SDL_TIMER_HAIKU
 
-#include <be/kernel/OS.h>
+#include <os/kernel/OS.h>
 
 #include "SDL_timer.h"
 
@@ -69,6 +69,6 @@ SDL_Delay(Uint32 ms)
     snooze(ms * 1000);
 }
 
-#endif /* SDL_TIMER_BEOS */
+#endif /* SDL_TIMER_HAIKU */
 
 /* vi: set ts=4 sw=4 expandtab: */