Mercurial > sdl-ios-xcode

comparison src/timer/macos/FastTimes.c @ 1621:f12379c41042

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes bug #195: The proper name of Apple's operating system is "Mac OS X" not "MacOS X", as can bee seen in many places, for example http://www.apple.com/macosx/). This contrasts the naming of the old operating system, which was called "MacOS" and today is often refered to as "MacOS Classic". The attached patches fixes the misuse of the name "MacOS X" in both the SDL12 and sdlweb CVS modules.
author Sam Lantinga <slouken@libsdl.org>
date Thu, 13 Apr 2006 13:08:26 +0000
parents 74212992fb08
children 14717b52abc0
comparison
equal deleted inserted replaced
1620:2fe5319df0e1 1621:f12379c41042
64 64
65 #define RTCToNano(w) ((double) (w).hi * 1000000000.0 + (double) (w).lo) 65 #define RTCToNano(w) ((double) (w).hi * 1000000000.0 + (double) (w).lo)
66 #define WideTo64bit(w) (*(UInt64 *) &(w)) 66 #define WideTo64bit(w) (*(UInt64 *) &(w))
67 67
68 /* LMGetTicks() is not in Carbon and TickCount() has a fair bit of overhead, 68 /* LMGetTicks() is not in Carbon and TickCount() has a fair bit of overhead,
69 so for speed we always read lowmem directly. This is a MacOS X no-no, but 69 so for speed we always read lowmem directly. This is a Mac OS X no-no, but
70 it always work on those systems that don't have a native Time Manager (ie, 70 it always work on those systems that don't have a native Time Manager (ie,
71 anything before MacOS 9) -- regardless whether we are in Carbon or not! */ 71 anything before MacOS 9) -- regardless whether we are in Carbon or not! */
72 #define MyLMGetTicks() (*(volatile UInt32 *) 0x16A) 72 #define MyLMGetTicks() (*(volatile UInt32 *) 0x16A)
73 73
74 #if GENERATINGPOWERPC 74 #if GENERATINGPOWERPC