projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.16.tar.gz
[xscreensaver]
/
OSX
/
main.m
diff --git
a/OSX/main.m
b/OSX/main.m
index 570c96135e5dc30276d6a8205996e52c04e05eaf..9f842ad840383e3c60d4b01c84de5ac058651a83 100644
(file)
--- a/
OSX/main.m
+++ b/
OSX/main.m
@@
-1,4
+1,4
@@
-/* xscreensaver, Copyright (c) 2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2006
-2012
Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-9,9
+9,21
@@
* implied warranty.
*/
* implied warranty.
*/
-#import <Cocoa/Cocoa.h>
+#ifdef USE_IPHONE
+# import <UIKit/UIKit.h>
+#else
+# import <Cocoa/Cocoa.h>
+#endif
-int main(int argc, char *argv[])
+int
+main (int argc, char *argv[])
{
{
- return NSApplicationMain(argc, (const char **) argv);
+# ifdef USE_IPHONE
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ int ret = UIApplicationMain (argc, argv, nil, nil);
+ [pool release];
+ return ret;
+# else
+ return NSApplicationMain(argc, (const char **) argv);
+# endif
}
}