From 63f3faca73892665d03cf393a4be21dfa3ef699b Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Wed, 1 Oct 2008 18:47:25 +0000 Subject: Readying SDK release. git-svn-id: http://svn.telesphoreo.org/trunk@487 514c082c-b64e-11dc-b46d-3d985efe055d --- tool/include.diff | 33 +++++++++++++++++++ tool/patches/GraphicsServices.h | 71 ----------------------------------------- tool/patches/NSFileManager.diff | 14 ++++++++ tool/patches/_structs.diff | 19 +++++++++++ 4 files changed, 66 insertions(+), 71 deletions(-) delete mode 100644 tool/patches/GraphicsServices.h create mode 100644 tool/patches/NSFileManager.diff (limited to 'tool') diff --git a/tool/include.diff b/tool/include.diff index 1d3264499..aea1b5747 100644 --- a/tool/include.diff +++ b/tool/include.diff @@ -230,6 +230,20 @@ diff -ru /apl/inc/Foundation/NSAffineTransform.h /apl/32/Foundation/NSAffineTran typedef struct { CGFloat m11, m12, m21, m22; +diff --git /usr/include/Foundation/NSFileManager.h /usr/include/Foundation/NSFileManager.h +index a394b96..216a43f 100644 +--- /usr/include/Foundation/NSFileManager.h ++++ /usr/include/Foundation/NSFileManager.h +@@ -97,8 +97,8 @@ + - (BOOL)linkPath:(NSString *)src toPath:(NSString *)dest handler:(id)handler; + - (BOOL)copyPath:(NSString *)src toPath:(NSString *)dest handler:(id)handler; + - (BOOL)movePath:(NSString *)src toPath:(NSString *)dest handler:(id)handler; +-- (BOOL)removeFileAtPath:(NSString *)path handler:(id)handler; + #endif ++- (BOOL)removeFileAtPath:(NSString *)path handler:(id)handler; + + /* Process working directory management. Despite the fact that these are instance methods on NSFileManager, these methods report and change (respectively) the working directory for the entire process. Developers are cautioned that doing so is fraught with peril. + */ diff -ru /apl/inc/Foundation/NSGeometry.h /apl/32/Foundation/NSGeometry.h --- /apl/inc/Foundation/NSGeometry.h 2008-02-19 13:11:41.000000000 +0000 +++ /apl/32/Foundation/NSGeometry.h 2008-04-20 02:52:14.000000000 +0000 @@ -399,6 +413,25 @@ index e130afa..1f98c98 100644 #define _STRUCT_ARM_THREAD_STATE struct __darwin_arm_thread_state _STRUCT_ARM_THREAD_STATE { +diff --git /usr/include/arm/_structs.h /usr/include/arm/_structs.h +index 2834b48..6c14349 100644 +--- /usr/include/arm/_structs.h ++++ /usr/include/arm/_structs.h +@@ -38,6 +38,14 @@ _STRUCT_MCONTEXT + #endif /* _STRUCT_MCONTEXT */ + #endif /* __need_struct_mcontext */ + ++#ifdef __need_mcontext_t ++#undef __need_mcontext_t ++#ifndef _MCONTEXT_T ++#define _MCONTEXT_T ++typedef _STRUCT_MCONTEXT *mcontext_t; ++#endif /* _MCONTEXT_T */ ++#endif /* __need_mcontext_t */ ++ + #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE) + #ifndef ARM_MCONTEXT_SIZE + #define ARM_MCONTEXT_SIZE (ARM_THREAD_STATE_COUNT + ARM_VFP_STATE_COUNT + ARM_EXCEPTION_STATE_COUNT) * sizeof(int) diff --git /usr/include/mach/arm/thread_status.h /usr/include/mach/arm/thread_status.h index 69f9f4f..cc66a92 100755 --- /usr/include/mach/arm/thread_status.h diff --git a/tool/patches/GraphicsServices.h b/tool/patches/GraphicsServices.h deleted file mode 100644 index 9a929ae2a..000000000 --- a/tool/patches/GraphicsServices.h +++ /dev/null @@ -1,71 +0,0 @@ -#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/NSFileManager.diff b/tool/patches/NSFileManager.diff new file mode 100644 index 000000000..014492286 --- /dev/null +++ b/tool/patches/NSFileManager.diff @@ -0,0 +1,14 @@ +diff --git /usr/include/Foundation/NSFileManager.h /usr/include/Foundation/NSFileManager.h +index a394b96..216a43f 100644 +--- /usr/include/Foundation/NSFileManager.h ++++ /usr/include/Foundation/NSFileManager.h +@@ -97,8 +97,8 @@ + - (BOOL)linkPath:(NSString *)src toPath:(NSString *)dest handler:(id)handler; + - (BOOL)copyPath:(NSString *)src toPath:(NSString *)dest handler:(id)handler; + - (BOOL)movePath:(NSString *)src toPath:(NSString *)dest handler:(id)handler; +-- (BOOL)removeFileAtPath:(NSString *)path handler:(id)handler; + #endif ++- (BOOL)removeFileAtPath:(NSString *)path handler:(id)handler; + + /* Process working directory management. Despite the fact that these are instance methods on NSFileManager, these methods report and change (respectively) the working directory for the entire process. Developers are cautioned that doing so is fraught with peril. + */ diff --git a/tool/patches/_structs.diff b/tool/patches/_structs.diff index 96b154370..3fff36278 100644 --- a/tool/patches/_structs.diff +++ b/tool/patches/_structs.diff @@ -11,3 +11,22 @@ index e130afa..1f98c98 100644 #define _STRUCT_ARM_THREAD_STATE struct __darwin_arm_thread_state _STRUCT_ARM_THREAD_STATE { +diff --git /usr/include/arm/_structs.h /usr/include/arm/_structs.h +index 2834b48..6c14349 100644 +--- /usr/include/arm/_structs.h ++++ /usr/include/arm/_structs.h +@@ -38,6 +38,14 @@ _STRUCT_MCONTEXT + #endif /* _STRUCT_MCONTEXT */ + #endif /* __need_struct_mcontext */ + ++#ifdef __need_mcontext_t ++#undef __need_mcontext_t ++#ifndef _MCONTEXT_T ++#define _MCONTEXT_T ++typedef _STRUCT_MCONTEXT *mcontext_t; ++#endif /* _MCONTEXT_T */ ++#endif /* __need_mcontext_t */ ++ + #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE) + #ifndef ARM_MCONTEXT_SIZE + #define ARM_MCONTEXT_SIZE (ARM_THREAD_STATE_COUNT + ARM_VFP_STATE_COUNT + ARM_EXCEPTION_STATE_COUNT) * sizeof(int) -- cgit v1.2.3