From 92e69908cb3a45cbf574cbba78431cb9f481b769 Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Tue, 8 Apr 2008 21:02:40 +0000 Subject: Updated patches to match documentation. git-svn-id: http://svn.telesphoreo.org/trunk@202 514c082c-b64e-11dc-b46d-3d985efe055d --- tool/patches/Authorization.diff | 11 ++++++ tool/patches/AvailabilityMacros.diff | 17 +++++++++ tool/patches/CoreFoundation.diff | 11 ++++++ tool/patches/FixMath.diff | 11 ++++++ tool/patches/GraphicsServices.h | 71 ++++++++++++++++++++++++++++++++++++ tool/patches/MachineExceptions.diff | 63 ++++++++++++++++++++++++++++++++ tool/patches/authorization.diff | 11 ------ tool/patches/availability.diff | 17 --------- tool/patches/fixmath.diff | 11 ------ tool/patches/fp.diff | 11 ++++++ tool/patches/signal.diff | 4 +- 11 files changed, 197 insertions(+), 41 deletions(-) create mode 100644 tool/patches/Authorization.diff create mode 100644 tool/patches/AvailabilityMacros.diff create mode 100644 tool/patches/CoreFoundation.diff create mode 100644 tool/patches/FixMath.diff create mode 100644 tool/patches/GraphicsServices.h create mode 100644 tool/patches/MachineExceptions.diff delete mode 100644 tool/patches/authorization.diff delete mode 100644 tool/patches/availability.diff delete mode 100644 tool/patches/fixmath.diff create mode 100644 tool/patches/fp.diff (limited to 'tool') diff --git a/tool/patches/Authorization.diff b/tool/patches/Authorization.diff new file mode 100644 index 000000000..25bc07dca --- /dev/null +++ b/tool/patches/Authorization.diff @@ -0,0 +1,11 @@ +--- /usr/include/Security/Authorization.h 2008-02-19 11:34:25.000000000 +0000 ++++ /usr/include/Security/Authorization.h 2008-03-24 11:07:40.000000000 +0000 +@@ -30,7 +30,7 @@ + #ifndef _SECURITY_AUTHORIZATION_H_ + #define _SECURITY_AUTHORIZATION_H_ + +-#include ++#include + #include + + #if defined(__cplusplus) diff --git a/tool/patches/AvailabilityMacros.diff b/tool/patches/AvailabilityMacros.diff new file mode 100644 index 000000000..4433f9ccf --- /dev/null +++ b/tool/patches/AvailabilityMacros.diff @@ -0,0 +1,17 @@ +--- /usr/include/AvailabilityMacros.h 2008-02-27 06:49:24.000000000 +0000 ++++ /usr/include/AvailabilityMacros.h 2008-03-28 14:10:13.000000000 +0000 +@@ -84,7 +84,13 @@ + #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ + #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ + #else +- #if __ppc64__ || __i386__ || __x86_64__ ++ #ifdef __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ ++ #if __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 ++ #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_4 ++ #else ++ #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_5 ++ #endif ++ #elif __ppc64__ || __i386__ || __x86_64__ + #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_4 + #elif __arm__ + #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_5 diff --git a/tool/patches/CoreFoundation.diff b/tool/patches/CoreFoundation.diff new file mode 100644 index 000000000..73e672c51 --- /dev/null +++ b/tool/patches/CoreFoundation.diff @@ -0,0 +1,11 @@ +--- /usr/include/CoreFoundation/CoreFoundation.h 2008-02-27 06:36:09.000000000 +0000 ++++ /usr/include/CoreFoundation/CoreFoundation.h 2008-03-29 18:47:27.000000000 +0000 +@@ -78,7 +78,7 @@ + #include + #include + #endif +-#if (TARGET_OS_MAC && !TARGET_OS_EMBEDDED) ++#if (TARGET_OS_MAC && !TARGET_OS_EMBEDDED) || TARGET_OS_EMBEDDED + #include + #include + #ifndef CF_OPEN_SOURCE diff --git a/tool/patches/FixMath.diff b/tool/patches/FixMath.diff new file mode 100644 index 000000000..f50f76882 --- /dev/null +++ b/tool/patches/FixMath.diff @@ -0,0 +1,11 @@ +--- /usr/include/CarbonCore/FixMath.h 2008-02-19 12:14:55.000000000 +0000 ++++ /usr/include/CarbonCore/FixMath.h 2008-03-27 09:50:49.000000000 +0000 +@@ -90,7 +90,7 @@ + + #else + +- #error "Unknown architecture." ++ //#error "Unknown architecture." + // To use unoptimized standard C code, remove above line. + #define _IntSaturate(x) ((x) <= -0x1p31f ? (int) -0x80000000 : \ + 0x1p31f <= (x) ? (int) 0x7fffffff : (int) (x)) diff --git a/tool/patches/GraphicsServices.h b/tool/patches/GraphicsServices.h new file mode 100644 index 000000000..9a929ae2a --- /dev/null +++ b/tool/patches/GraphicsServices.h @@ -0,0 +1,71 @@ +#ifndef GRAPHICSSERVICES_H +#define GRAPHICSSERVICES_H + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +enum { + kGSEventTypeOneFingerDown = 1, + kGSEventTypeAllFingersUp = 2, + kGSEventTypeOneFingerUp = 5, + kGSEventTypeGesture = 6 +} GSEventType; + +struct __GSEvent; +typedef struct __GSEvent GSEvent; +typedef GSEvent *GSEventRef; + +int GSEventIsChordingHandEvent(GSEventRef ev); +int GSEventGetClickCount(GSEventRef ev); +CGRect GSEventGetLocationInWindow(GSEventRef ev); +float GSEventGetDeltaX(GSEventRef ev); +float GSEventGetDeltaY(GSEventRef ev); +CGPoint GSEventGetInnerMostPathPosition(GSEventRef ev); +CGPoint GSEventGetOuterMostPathPosition(GSEventRef ev); +unsigned int GSEventGetSubType(GSEventRef ev); +unsigned int GSEventGetType(GSEventRef ev); +int GSEventDeviceOrientation(GSEventRef ev); + +typedef enum { + kGSFontTraitNone = 0, + kGSFontTraitItalic = 1, + kGSFontTraitBold = 2, + kGSFontTraitBoldItalic = (kGSFontTraitBold | kGSFontTraitItalic) +} GSFontTrait; + +struct __GSFont; +typedef struct __GSFont *GSFontRef; + +GSFontRef GSFontCreateWithName(const char *name, GSFontTrait traits, float size); +const char *GSFontGetFamilyName(GSFontRef font); +const char *GSFontGetFullName(GSFontRef font); +bool GSFontIsBold(GSFontRef font); +bool GSFontIsFixedPitch(GSFontRef font); +GSFontTrait GSFontGetTraits(GSFontRef font); + +CGColorRef GSColorCreate(CGColorSpaceRef colorspace, const float components[]); +CGColorRef GSColorCreateBlendedColorWithFraction(CGColorRef color, CGColorRef blendedColor, float fraction); +CGColorRef GSColorCreateColorWithDeviceRGBA(float red, float green, float blue, float alpha); +CGColorRef GSColorCreateWithDeviceWhite(float white, float alpha); +CGColorRef GSColorCreateHighlightWithLevel(CGColorRef originalColor, float highlightLevel); +CGColorRef GSColorCreateShadowWithLevel(CGColorRef originalColor, float shadowLevel); + +float GSColorGetRedComponent(CGColorRef color); +float GSColorGetGreenComponent(CGColorRef color); +float GSColorGetBlueComponent(CGColorRef color); +float GSColorGetAlphaComponent(CGColorRef color); +const float *GSColorGetRGBAComponents(CGColorRef color); + +void GSColorSetColor(CGColorRef color); +void GSColorSetSystemColor(CGColorRef color); + +#ifdef __cplusplus +} +#endif + +#endif + diff --git a/tool/patches/MachineExceptions.diff b/tool/patches/MachineExceptions.diff new file mode 100644 index 000000000..ad29c21a4 --- /dev/null +++ b/tool/patches/MachineExceptions.diff @@ -0,0 +1,63 @@ +--- /usr/include/CarbonCore/MachineExceptions.h 2006-09-11 23:05:25.000000000 -0500 ++++ /usr/include/CarbonCore/MachineExceptions.h 2007-07-23 18:15:13.000000000 -0500 +@@ -277,6 +277,60 @@ + typedef struct ExceptionInformation ExceptionInformation; + #endif /* TARGET_CPU_X86 */ + ++#if TARGET_CPU_ARM ++ ++struct MachineInformationARM { ++ int unused; ++}; ++typedef struct MachineInformationARM MachineInformationARM; ++ ++struct RegisterInformationARM { ++ unsigned int R0; ++ unsigned int R1; ++ unsigned int R2; ++ unsigned int R3; ++ unsigned int R4; ++ unsigned int R5; ++ unsigned int R6; ++ unsigned int R7; ++ unsigned int R8; ++ unsigned int R9; ++ unsigned int R10; ++ unsigned int R11; ++ unsigned int R12; ++ unsigned int R13; ++ unsigned int R14; ++ unsigned int R15; ++ unsigned int R16; ++ unsigned int R17; ++}; ++typedef struct RegisterInformationARM RegisterInformationARM; ++ ++struct FPUInformationARM { ++ unsigned int dunno; /* FIXME */ ++}; ++typedef struct FPUInformationARM FPUInformationARM; ++ ++struct VectorInformationARM { ++ unsigned int dunno[8]; ++}; ++typedef struct VectorInformationARM VectorInformationARM; ++ ++typedef MachineInformationARM MachineInformation; ++typedef RegisterInformationARM RegisterInformation; ++typedef FPUInformationARM FPUInformation; ++typedef VectorInformationARM VectorInformation; ++struct ExceptionInformation { ++ ExceptionKind theKind; ++ MachineInformation * machineState; ++ RegisterInformation * registerImage; ++ FPUInformation * FPUImage; ++ ExceptionInfo info; ++ VectorInformation * vectorImage; ++}; ++typedef struct ExceptionInformation ExceptionInformation; ++#endif ++ + /* + Note: An ExceptionHandler is NOT a UniversalProcPtr, except in Carbon. + It must be a PowerPC function pointer with NO routine descriptor, diff --git a/tool/patches/authorization.diff b/tool/patches/authorization.diff deleted file mode 100644 index 1d3f02f61..000000000 --- a/tool/patches/authorization.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /home/dat/bin/MacOSX10.5.sdk/System/Library/Frameworks/Security.framework/Versions/A/Headers/Authorization.h 2008-02-19 11:34:25.000000000 +0000 -+++ /home/dat/apl/inc/Security/Authorization.h 2008-03-24 11:07:40.000000000 +0000 -@@ -30,7 +30,7 @@ - #ifndef _SECURITY_AUTHORIZATION_H_ - #define _SECURITY_AUTHORIZATION_H_ - --#include -+#include - #include - - #if defined(__cplusplus) diff --git a/tool/patches/availability.diff b/tool/patches/availability.diff deleted file mode 100644 index 0cbf0f8f3..000000000 --- a/tool/patches/availability.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- /home/saurik/iphone/aspen-dev/SDKs/Aspen1.2.sdk/usr/include/AvailabilityMacros.h 2008-02-27 06:49:24.000000000 +0000 -+++ /apl/inc/AvailabilityMacros.h 2008-03-28 14:10:13.000000000 +0000 -@@ -84,7 +84,13 @@ - #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ - #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ - #else -- #if __ppc64__ || __i386__ || __x86_64__ -+ #ifdef __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ -+ #if __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_4 -+ #else -+ #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_5 -+ #endif -+ #elif __ppc64__ || __i386__ || __x86_64__ - #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_4 - #elif __arm__ - #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_5 diff --git a/tool/patches/fixmath.diff b/tool/patches/fixmath.diff deleted file mode 100644 index a7649d890..000000000 --- a/tool/patches/fixmath.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /home/dat/bin/MacOSX10.5.sdk/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/FixMath.h 2008-02-19 12:14:55.000000000 +0000 -+++ /apl/inc/CarbonCore/FixMath.h 2008-03-27 09:50:49.000000000 +0000 -@@ -90,7 +90,7 @@ - - #else - -- #error "Unknown architecture." -+ //#error "Unknown architecture." - // To use unoptimized standard C code, remove above line. - #define _IntSaturate(x) ((x) <= -0x1p31f ? (int) -0x80000000 : \ - 0x1p31f <= (x) ? (int) 0x7fffffff : (int) (x)) diff --git a/tool/patches/fp.diff b/tool/patches/fp.diff new file mode 100644 index 000000000..c5ddfebe5 --- /dev/null +++ b/tool/patches/fp.diff @@ -0,0 +1,11 @@ +--- /usr/include/CarbonCore/fp.h 2008-02-19 12:14:55.000000000 +0000 ++++ /usr/include/CarbonCore/fp.h 2008-03-29 18:41:50.000000000 +0000 +@@ -1314,7 +1314,7 @@ + * dec2l Similar to dec2num except a long is returned. * + * * + ********************************************************************************/ +-#if TARGET_CPU_PPC || TARGET_CPU_X86 || TARGET_CPU_PPC64 || TARGET_CPU_X86_64 ++#if TARGET_CPU_PPC || TARGET_CPU_X86 || TARGET_CPU_PPC64 || TARGET_CPU_X86_64 || TARGET_CPU_ARM + #define SIGDIGLEN 36 + #endif + #define DECSTROUTLEN 80 /* max length for dec2str output */ diff --git a/tool/patches/signal.diff b/tool/patches/signal.diff index 3e874e3f8..8ebaab39d 100644 --- a/tool/patches/signal.diff +++ b/tool/patches/signal.diff @@ -1,5 +1,5 @@ ---- /home/saurik/iphone/aspen-dev/SDKs/Aspen1.2.sdk/usr/include/arm/signal.h 2008-02-27 05:37:19.000000000 +0000 -+++ /home/dat/apl/inc/arm/signal.h 2008-03-24 09:51:14.000000000 +0000 +--- /usr/include/arm/signal.h 2008-02-27 05:37:19.000000000 +0000 ++++ /usr/include/arm/signal.h 2008-03-24 09:51:14.000000000 +0000 @@ -13,6 +13,8 @@ #ifndef _ANSI_SOURCE -- cgit v1.2.3