diff options
| author | Pietro Gagliardi <[email protected]> | 2014-05-20 08:08:55 -0400 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2014-05-20 08:08:55 -0400 |
| commit | c6d24f0e32c8a03b9f0f31d077c6ffbff58ef74d (patch) | |
| tree | a8490f04f090bb0d91046655acbddc6d6ba95db3 /objc_darwin.m | |
| parent | 3e9e767d79c85726741faee7b025412a27a6f86c (diff) | |
Changed #include to #import on the Objective-C files to settle the whole include guards thing. Now to continue fixing Mac OS X 10.6 building...
Diffstat (limited to 'objc_darwin.m')
| -rw-r--r-- | objc_darwin.m | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/objc_darwin.m b/objc_darwin.m index ded192e..79966c9 100644 --- a/objc_darwin.m +++ b/objc_darwin.m @@ -1,25 +1,24 @@ // 15 may 2014 #include "objc_darwin.h" -#include <Foundation/NSString.h> +#import <Foundation/NSString.h> // see delegateuitask_darwin.m // in this case, NSScrollView.h includes NSApplication.h -// NOTE NSView.h apparently lacks include guards; we'll need to uncomment the one below -#include <AppKit/NSView.h> +#import <AppKit/NSView.h> #undef MAC_OS_X_VERSION_MIN_REQUIRED #undef MAC_OS_X_VERSION_MAX_ALLOWED #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_7 #define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_7 -#include <AppKit/NSApplication.h> +#import <AppKit/NSApplication.h> #undef MAC_OS_X_VERSION_MIN_REQUIRED #undef MAC_OS_X_VERSION_MAX_ALLOWED #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_6 #define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_6 -//#include <AppKit/NSView.h> -#include <AppKit/NSScrollView.h> +#import <AppKit/NSView.h> +#import <AppKit/NSScrollView.h> #define to(T, x) ((T *) (x)) #define _toNSString(x) to(NSString, (x)) |