Mercurial > sdl-ios-xcode
comparison src/joystick/darwin/SDL_sysjoystick.c @ 1621:f12379c41042
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 | 405e20dc004c |
children | 92947e3a18db |
comparison
equal
deleted
inserted
replaced
1620:2fe5319df0e1 | 1621:f12379c41042 |
---|---|
19 Sam Lantinga | 19 Sam Lantinga |
20 slouken@libsdl.org | 20 slouken@libsdl.org |
21 */ | 21 */ |
22 #include "SDL_config.h" | 22 #include "SDL_config.h" |
23 | 23 |
24 /* SDL joystick driver for Darwin / MacOS X, based on the IOKit HID API */ | 24 /* SDL joystick driver for Darwin / Mac OS X, based on the IOKit HID API */ |
25 /* Written 2001 by Max Horn */ | 25 /* Written 2001 by Max Horn */ |
26 | 26 |
27 #include <unistd.h> | 27 #include <unistd.h> |
28 #include <ctype.h> | 28 #include <ctype.h> |
29 #include <sysexits.h> | 29 #include <sysexits.h> |
32 #include <IOKit/IOKitLib.h> | 32 #include <IOKit/IOKitLib.h> |
33 #include <IOKit/IOCFPlugIn.h> | 33 #include <IOKit/IOCFPlugIn.h> |
34 #ifdef MACOS_10_0_4 | 34 #ifdef MACOS_10_0_4 |
35 #include <IOKit/hidsystem/IOHIDUsageTables.h> | 35 #include <IOKit/hidsystem/IOHIDUsageTables.h> |
36 #else | 36 #else |
37 /* The header was moved here in MacOS X 10.1 */ | 37 /* The header was moved here in Mac OS X 10.1 */ |
38 #include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h> | 38 #include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h> |
39 #endif | 39 #endif |
40 #include <IOKit/hid/IOHIDLib.h> | 40 #include <IOKit/hid/IOHIDLib.h> |
41 #include <IOKit/hid/IOHIDKeys.h> | 41 #include <IOKit/hid/IOHIDKeys.h> |
42 #include <CoreFoundation/CoreFoundation.h> | 42 #include <CoreFoundation/CoreFoundation.h> |