Fixed bug #225
authorSam Lantinga <slouken@libsdl.org>
Thu, 11 May 2006 03:19:03 +0000
changeset 18104c270c3a88ed
parent 1809 41ab83bec62f
child 1811 e6de7e5fd451
Fixed bug #225

Making the old code limp along, for Carbon builds.
src/timer/macos/FastTimes.c
src/timer/macos/SDL_systimer.c
     1.1 --- a/src/timer/macos/FastTimes.c	Thu May 11 03:08:39 2006 +0000
     1.2 +++ b/src/timer/macos/FastTimes.c	Thu May 11 03:19:03 2006 +0000
     1.3 @@ -19,6 +19,11 @@
     1.4  
     1.5  #include "FastTimes.h"
     1.6  
     1.7 +#ifdef TARGET_CPU_PPC
     1.8 +#undef GENERATINGPOWERPC /* stop whining */
     1.9 +#define GENERATINGPOWERPC TARGET_CPU_PPC
    1.10 +#endif
    1.11 +
    1.12  /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */
    1.13  /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */
    1.14  /*
     2.1 --- a/src/timer/macos/SDL_systimer.c	Thu May 11 03:08:39 2006 +0000
     2.2 +++ b/src/timer/macos/SDL_systimer.c	Thu May 11 03:19:03 2006 +0000
     2.3 @@ -36,6 +36,10 @@
     2.4  
     2.5  #include "FastTimes.h"
     2.6  
     2.7 +#ifdef TARGET_API_MAC_CARBON
     2.8 +#define NewTimerProc NewTimerUPP
     2.9 +#endif
    2.10 +
    2.11  #define MS_PER_TICK	(1000.0/60.0)		/* MacOS tick = 1/60 second */
    2.12  
    2.13  
    2.14 @@ -67,7 +71,11 @@
    2.15  
    2.16          stop = SDL_GetTicks() + ms;
    2.17          do {
    2.18 +            #ifdef TARGET_API_MAC_CARBON
    2.19 +                MPYield();
    2.20 +            #else
    2.21                  SystemTask();
    2.22 +            #endif
    2.23  
    2.24                  now = SDL_GetTicks();
    2.25