merge 6ea2f71

cjwl · Mar 31, 2015 · ffacaaa · ffacaaa
2 parents c7666b5 + 6ea2f71
commit ffacaaa
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 6 deletions.
diff --git a/Foundation/NSDate/NSDate.h b/Foundation/NSDate/NSDate.h
@@ -26,6 +26,7 @@ FOUNDATION_EXPORT const NSTimeInterval NSTimeIntervalSince1970;
 -initWithString:(NSString *)string;
 -initWithTimeIntervalSinceReferenceDate:(NSTimeInterval)seconds;
 -initWithTimeIntervalSinceNow:(NSTimeInterval)seconds;
+-initWithTimeIntervalSince1970:(NSTimeInterval)seconds;
 -initWithTimeInterval:(NSTimeInterval)seconds sinceDate:(NSDate *)date;
 
 +date;

diff --git a/Foundation/NSDate/NSDate.m b/Foundation/NSDate/NSDate.m
@@ -67,6 +67,11 @@ +(NSTimeInterval)timeIntervalSinceReferenceDate {
      NSPlatformTimeIntervalSinceReferenceDate()+seconds];
 }
 
+-initWithTimeIntervalSince1970:(NSTimeInterval)seconds {
+    return [self initWithTimeIntervalSinceReferenceDate:
+            -NSTimeIntervalSince1970+seconds];
+}
+
 -initWithTimeInterval:(NSTimeInterval)seconds sinceDate:(NSDate *)other {
    return [self initWithTimeIntervalSinceReferenceDate:
      [other timeIntervalSinceReferenceDate]+seconds];
@@ -91,8 +96,7 @@ +(NSTimeInterval)timeIntervalSinceReferenceDate {
 }
 
 +dateWithTimeIntervalSince1970:(NSTimeInterval)seconds {
-   return [[[self allocWithZone:NULL] initWithTimeIntervalSinceReferenceDate:
-     -NSTimeIntervalSince1970+seconds] autorelease];
+   return [[[self allocWithZone:NULL] initWithTimeIntervalSince1970:seconds] autorelease];
 }
 
 

diff --git a/Foundation/NSURL/NSURL.h b/Foundation/NSURL/NSURL.h
@@ -7,7 +7,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #import <Foundation/NSObject.h>
 
-@class NSURLHandle,NSNumber,NSData;
+@class NSURLHandle,NSNumber,NSData,NSArray;
 
 FOUNDATION_EXPORT NSString * const NSURLFileScheme;
 
@@ -73,3 +73,15 @@ FOUNDATION_EXPORT NSString * const NSURLFileScheme;
 
 @end
 
+@interface NSURL (NSURLPathUtilities)
+
++ (NSURL *)fileURLWithPathComponents:(NSArray *)components;
+- (NSArray *)pathComponents;
+- (NSURL *)URLByAppendingPathComponent:(NSString *)pathComponent isDirectory:(BOOL)isDirectory;
+- (NSURL *)URLByAppendingPathExtension:(NSString *)pathExtension;
+- (NSURL *)URLByDeletingPathExtension;
+
+- (NSURL *)URLByStandardizingPath;
+- (NSURL *)URLByResolvingSymlinksInPath;
+
+@end
diff --git a/Foundation/NSURL/NSURL.m b/Foundation/NSURL/NSURL.m
@@ -899,3 +899,28 @@ - (NSString *)pathExtension
 }
 
 @end
+
+@implementation NSURL (NSURLPathUtilities)
+
++ (NSURL *)fileURLWithPathComponents:(NSArray *)components {
+    return [NSURL fileURLWithPath:[NSString pathWithComponents:components]];
+}
+
+- (NSArray *)pathComponents {
+    return [[self path] pathComponents];
+}
+
+- (NSURL *)URLByAppendingPathComponent:(NSString *)pathComponent isDirectory:(BOOL)isDirectory {
+    NSUnimplementedMethod();
+    return nil;
+}
+
+- (NSURL *)URLByStandardizingPath {
+    return [NSURL fileURLWithPath:[[self path] stringByStandardizingPath]];
+}
+
+- (NSURL *)URLByResolvingSymlinksInPath {
+    return [NSURL fileURLWithPath:[[self path] stringByResolvingSymlinksInPath]];
+}
+
+@end
diff --git a/objc/objc_class.m b/objc/objc_class.m
@@ -654,7 +654,7 @@ BOOL class_addMethod(Class cls, SEL name, IMP imp, const char *types) {
 	struct objc_method_list *methodList = calloc(sizeof(struct objc_method_list)+sizeof(struct objc_method), 1);
         char *typescopy = (char *)malloc(strlen(types)+1);
 
-	newMethod->method_name = name;
+	newMethod->method_name = sel_getSelector(name);
         strcpy(typescopy,(char *)types);
 	newMethod->method_types = typescopy;
 	newMethod->method_imp = imp;

diff --git a/xcconfig/windows-i386-clang.xcconfig b/xcconfig/windows-i386-clang.xcconfig
@@ -16,5 +16,5 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0
 WINDOWS_i386_COMPILER_CFLAGS = -ccc-host-triple i386-pc-mingw32msvc -ccc-gcc-name i386-mingw32msvc-gcc -DWINDOWS=1 -D__WIN32__=1 -fno-builtin
 WINDOWS_i386_COMPILER_LDFLAGS = -ccc-host-triple i386-pc-mingw32msvc -ccc-gcc-name i386-mingw32msvc-gcc
 
-WINDOWS_i386_COMPILER_ISYSTEM = -isystem /Developer/Cocotron/1.0/Windows/i386/sysroot/mingw/include/
-WINDOWS_i386_COMPILER_SYSLIB = /Developer/Cocotron/1.0/Windows/i386/sysroot/mingw/lib/
+WINDOWS_i386_COMPILER_ISYSTEM = -isystem /Developer/Cocotron/1.0/Windows/i386/gcc-4.3.1/i386-mingw32msvc/include/
+WINDOWS_i386_COMPILER_SYSLIB = /Developer/Cocotron/1.0/Windows/i386/gcc-4.3.1/i386-mingw32msvc/lib