@@ -37,17 +37,17 @@
 
 	[delegate applicationWillTerminate];
 }
 
 int
-of_application_main(int argc, char *argv[], Class cls)
+of_application_main(int *argc, char **argv[], Class cls)
 {
 	OFApplication *app = [OFApplication sharedApplication];
 	id <OFApplicationDelegate> delegate = [[cls alloc] init];
 
-	[app setArgumentCount: &argc
-	    andArgumentValues: &argv];
+	[app setArgumentCount: argc
+	    andArgumentValues: argv];
 
 	[app setDelegate: delegate];
 	[(id)delegate release];
 
 	[app run];
@@ -144,11 +144,11 @@
 
 	programName = [[OFString alloc] initWithCString: (*argv)[0]];
 	arguments = [[OFMutableArray alloc] init];
 
 	for (i = 1; i < *argc; i++)
-		[arguments addObject: [OFString stringWithCString: *(argv)[i]]];
+		[arguments addObject: [OFString stringWithCString: (*argv)[i]]];
 
 	[pool release];
 }
 
 - (void)getArgumentCount: (int**)argc_