diff src/video/riscos/SDL_wimppoll.c @ 1361:19418e4422cb

New configure-based build system. Still work in progress, but much improved
author Sam Lantinga <slouken@libsdl.org>
date Thu, 16 Feb 2006 10:11:48 +0000
parents 3692456e7b0f
children d910939febfa
line wrap: on
line diff
--- a/src/video/riscos/SDL_wimppoll.c	Fri Feb 10 07:29:08 2006 +0000
+++ b/src/video/riscos/SDL_wimppoll.c	Thu Feb 16 10:11:48 2006 +0000
@@ -29,8 +29,8 @@
 
 #include "SDL.h"
 #include "SDL_syswm.h"
-#include "SDL_sysevents.h"
-#include "SDL_events_c.h"
+#include "../../events/SDL_sysevents.h"
+#include "../../events/SDL_events_c.h"
 #include "SDL_riscosvideo.h"
 #include "SDL_riscosevents_c.h"
 #include "SDL_riscosmouse_c.h"
@@ -44,7 +44,7 @@
 #include "swis.h"
 #include "unixlib/os.h"
 
-#ifndef DISABLE_THREADS
+#if !SDL_THREADS_DISABLED
 #include <pthread.h>
 #endif
 
@@ -61,10 +61,9 @@
 extern void WIMP_PollMouse(_THIS);
 extern void RISCOS_PollKeyboard();
 
-#ifdef DISABLE_THREADS
+#if SDL_THREADS_DISABLED
 /* Timer running function */
 extern void RISCOS_CheckTimer();
-
 #else
 extern int riscos_using_threads;
 #endif
@@ -84,7 +83,7 @@
 	WIMP_Poll(this, 0);
 	if (hasFocus) RISCOS_PollKeyboard();
 	if (mouseInWindow) WIMP_PollMouse(this);
-#ifdef DISABLE_THREADS
+#if SDL_THREADS_DISABLED
 	if (SDL_timer_running) RISCOS_CheckTimer();
 #endif
 }
@@ -110,7 +109,7 @@
 
     while (doPoll)
     {
-#ifndef DISABLE_THREADS
+#if !SDL_THREADS_DISABLED
        /* Stop thread callbacks while program is paged out */
        if (riscos_using_threads) __pthread_stop_ticker();
 #endif
@@ -289,7 +288,7 @@
 			/* Fall out of polling loop if message is successfully posted */
 			if (SDL_PrivateSysWMEvent(&wmmsg)) doPoll = 0;
 		}
-#ifndef DISABLE_THREADS
+#if !SDL_THREADS_DISABLED
 		if (riscos_using_threads)
 		{
                    /* Restart ticker here so other thread can not interfere
@@ -324,7 +323,7 @@
 	{
 		WIMP_Poll(current_video, 0);
 	}
-#ifdef DISABLE_THREADS
+#if SDL_THREADS_DISABLED
 	if (SDL_timer_running) RISCOS_CheckTimer();
 #endif
 }