src/events/SDL_events.c
changeset 1361 19418e4422cb
parent 1358 c71e05b4dc2e
child 1402 d910939febfa
     1.1 --- a/src/events/SDL_events.c	Fri Feb 10 07:29:08 2006 +0000
     1.2 +++ b/src/events/SDL_events.c	Thu Feb 16 10:11:48 2006 +0000
     1.3 @@ -23,16 +23,13 @@
     1.4  /* General event handling code for SDL */
     1.5  
     1.6  #include "SDL.h"
     1.7 -#include "SDL_events_c.h"
     1.8 -#include "SDL_timer_c.h"
     1.9 -#ifndef DISABLE_JOYSTICK
    1.10 -#include "SDL_joystick_c.h"
    1.11 -#endif
    1.12 -#ifndef ENABLE_X11
    1.13 -#define DISABLE_X11
    1.14 -#endif
    1.15  #include "SDL_syswm.h"
    1.16  #include "SDL_sysevents.h"
    1.17 +#include "SDL_events_c.h"
    1.18 +#include "../timer/SDL_timer_c.h"
    1.19 +#if !SDL_JOYSTICK_DISABLED
    1.20 +#include "../joystick/SDL_joystick_c.h"
    1.21 +#endif
    1.22  
    1.23  /* Public data -- the event filter */
    1.24  SDL_EventFilter SDL_EventOK = NULL;
    1.25 @@ -112,7 +109,7 @@
    1.26  		/* Queue pending key-repeat events */
    1.27  		SDL_CheckKeyRepeat();
    1.28  
    1.29 -#ifndef DISABLE_JOYSTICK
    1.30 +#if !SDL_JOYSTICK_DISABLED
    1.31  		/* Check for joystick state change */
    1.32  		if ( SDL_numjoysticks && (SDL_eventstate & SDL_JOYEVENTMASK) ) {
    1.33  			SDL_JoystickUpdate();
    1.34 @@ -150,16 +147,16 @@
    1.35  	SDL_memset(&SDL_EventLock, 0, sizeof(SDL_EventLock));
    1.36  
    1.37  	/* Create the lock and set ourselves active */
    1.38 -#ifndef DISABLE_THREADS
    1.39 +#if !SDL_THREADS_DISABLED
    1.40  	SDL_EventQ.lock = SDL_CreateMutex();
    1.41  	if ( SDL_EventQ.lock == NULL ) {
    1.42 -#ifdef macintosh /* On MacOS 7/8, you can't multithread, so no lock needed */
    1.43 +#ifdef macintosh /* MacOS classic you can't multithread, so no lock needed */
    1.44  		;
    1.45  #else
    1.46  		return(-1);
    1.47  #endif
    1.48  	}
    1.49 -#endif /* !DISABLE_THREADS */
    1.50 +#endif /* !SDL_THREADS_DISABLED */
    1.51  	SDL_EventQ.active = 1;
    1.52  
    1.53  	if ( (flags&SDL_INIT_EVENTTHREAD) == SDL_INIT_EVENTTHREAD ) {
    1.54 @@ -379,7 +376,7 @@
    1.55  		/* Queue pending key-repeat events */
    1.56  		SDL_CheckKeyRepeat();
    1.57  
    1.58 -#ifndef DISABLE_JOYSTICK
    1.59 +#if !SDL_JOYSTICK_DISABLED
    1.60  		/* Check for joystick state change */
    1.61  		if ( SDL_numjoysticks && (SDL_eventstate & SDL_JOYEVENTMASK) ) {
    1.62  			SDL_JoystickUpdate();