diff --git a/Mac/Python/macgetargv.c b/Mac/Python/macgetargv.c
index 1bd57ad..c5af0ec 100644
--- a/Mac/Python/macgetargv.c
+++ b/Mac/Python/macgetargv.c
@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 
+#ifdef WITHOUT_FRAMEWORKS
 #include <Types.h>
 #include <Files.h>
 #include <Events.h>
@@ -40,6 +41,9 @@
 #include <Menus.h>
 #include <Dialogs.h>
 #include <Windows.h>
+#else
+#include <Carbon/Carbon.h>
+#endif /* WITHOUT_FRAMEWORKS */
 
 #if UNIVERSAL_INTERFACES_VERSION >= 0x0340
 typedef long refcontype;
@@ -54,7 +58,6 @@
 static char *arg_vector[256];
 FSSpec PyMac_ApplicationFSSpec;
 char PyMac_ApplicationPath[256];
-static int applocation_inited;
 
 /* Duplicate a string to the heap. We also export this since it isn't standard
 ** and others use it
@@ -70,14 +73,33 @@
 }
 #endif
 
+#if TARGET_API_MAC_OSX
+OSErr
+PyMac_GetFullPath(FSSpec *fss, char *path)
+{
+	FSRef fsr;
+	OSErr err;
+	
+	*path = '\0';
+	err = FSpMakeFSRef(fss, &fsr);
+	if ( err ) return err;
+	err = (OSErr)FSRefMakePath(&fsr, path, 1024);
+	if ( err ) return err;
+	return 0;
+}
+#endif /* TARGET_API_MAC_OSX */
+
+
+#if !TARGET_API_MAC_OSX
 /* Initialize FSSpec and full name of current application */
 
 OSErr
-PyMac_init_process_location()
+PyMac_init_process_location(void)
 {
 	ProcessSerialNumber currentPSN;
 	ProcessInfoRec info;
 	OSErr err;
+	static int applocation_inited;
 	
 	if ( applocation_inited ) return 0;
 	currentPSN.highLongOfPSN = 0;
@@ -92,6 +114,7 @@
 	applocation_inited = 1;
 	return 0;
 }
+#endif /* !TARGET_API_MAC_OSX */
 
 /* Check that there aren't any args remaining in the event */
 
@@ -147,15 +170,15 @@
 	DescType rttype;
 	long i, ndocs, size;
 	FSSpec fss;
-	char path[256];
+	char path[1024];
 	
 	got_one = 1;
-	if (err = AEGetParamDesc(theAppleEvent,
-				 keyDirectObject, typeAEList, &doclist))
+	if ((err = AEGetParamDesc(theAppleEvent,
+				 keyDirectObject, typeAEList, &doclist)))
 		return err;
-	if (err = get_missing_params(theAppleEvent))
+	if ((err = get_missing_params(theAppleEvent)))
 		return err;
-	if (err = AECountItems(&doclist, &ndocs))
+	if ((err = AECountItems(&doclist, &ndocs)))
 		return err;
 	for(i = 1; i <= ndocs; i++) {
 		err = AEGetNthPtr(&doclist, i, typeFSS,
@@ -174,7 +197,7 @@
 AEEventHandlerUPP not_upp;
 
 static void
-set_ae_handlers()
+set_ae_handlers(void)
 {
 	open_doc_upp = NewAEEventHandlerUPP(&handle_open_doc);
 	open_app_upp = NewAEEventHandlerUPP(&handle_open_app);
@@ -193,7 +216,7 @@
 /* Uninstall standard core event handlers */
 
 static void
-reset_ae_handlers()
+reset_ae_handlers(void)
 {
 	AERemoveEventHandler(kCoreEventClass, kAEOpenApplication,
 			     open_app_upp, false);
@@ -208,7 +231,7 @@
 /* Wait for events until a core event has been handled */
 
 static void 
-event_loop()
+event_loop(void)
 {
 	EventRecord event;
 	int n;
@@ -229,14 +252,16 @@
 /* Get the argv vector, return argc */
 
 int
-PyMac_GetArgv(pargv, noevents)
-	char ***pargv;
-	int noevents;
+PyMac_GetArgv(char ***pargv, int noevents)
 {
-	
 	arg_count = 0;
+#if TARGET_API_MAC_OSX
+	/* In an OSX bundle argv[0] is okay */
+	arg_count++;
+#else
 	(void)PyMac_init_process_location();
 	arg_vector[arg_count++] = strdup(PyMac_ApplicationPath);
+#endif /* TARGET_API_MAC_OSX */
 	
 	if( !noevents ) {
 		set_ae_handlers();
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
index c72bc33..39f6222 100644
--- a/Mac/Python/macmain.c
+++ b/Mac/Python/macmain.c
@@ -30,6 +30,7 @@
 #include "marshal.h"
 #include "macglue.h"
 
+#ifdef WITHOUT_FRAMEWORKS
 #include <Memory.h>
 #include <Resources.h>
 #include <stdio.h>
@@ -41,21 +42,23 @@
 #include <Gestalt.h>
 #include <Appearance.h>
 #endif /* USE_APPEARANCE */
+#else
+#include <Carbon/Carbon.h>
+#endif /* WITHOUT_FRAMEWORKS */
+
 #ifdef __MWERKS__
 #include <SIOUX.h>
 #define USE_SIOUX
 extern int ccommand(char ***);
 #if __profile__ == 1
 #include <profiler.h>
-#endif
-#endif
+#endif /* __profile__ */
+#endif /* __MWERKS__ */
+
 #include <unistd.h>
 #ifdef USE_MAC_SHARED_LIBRARY
 extern PyMac_AddLibResources(void);
 #endif
-//#ifdef USE_GUSI
-//#include "GUSISIOUX.h"
-//#endif
 
 #define STARTUP "PythonStartup"
 
@@ -81,7 +84,7 @@
 static void Py_Main(int, char **); /* Forward */
 void PyMac_Exit(int); /* Forward */
 
-static void init_appearance()
+static void init_appearance(void)
 {
 #ifdef USE_APPEARANCE
 	OSErr err;
@@ -99,7 +102,7 @@
 /* Initialize the Mac toolbox world */
 
 static void
-init_mac_world()
+init_mac_world(void)
 {
 #if !TARGET_API_MAC_CARBON
 	/* These aren't needed for carbon */
@@ -127,8 +130,6 @@
 	ControlHandle handle;
 	DialogPtr dialog;
 	Rect rect;
-	int old_argc = *argcp;
-	int i;
 
 	/*
 	** If the preferences disallows interactive options we return,
@@ -191,7 +192,10 @@
 			HMSetBalloons(!HMGetBalloons());
 		}
 #endif
+#if !TARGET_API_MAC_OSX
 		if ( item == OPT_CMDLINE ) {
+			int old_argc = *argcp;
+			int i;
 			int new_argc, newer_argc;
 			char **new_argv, **newer_argv;
 			
@@ -209,6 +213,7 @@
 			
 			/* XXXX Is it not safe to use free() here, apparently */
 		}
+#endif /* !TARGET_API_MAC_OSX */
 #define OPT_ITEM(num, var) \
 		if ( item == (num) ) { \
 			p->var = !p->var; \
@@ -283,7 +288,9 @@
 
 #ifdef USE_SIOUX
 	/* Set various SIOUX flags. Some are changed later based on options */
-/*	SIOUXSettings.standalone = 0;	/* XXXX Attempting to keep sioux from eating events */
+#if 0
+	SIOUXSettings.standalone = 0;	/* XXXX Attempting to keep sioux from eating events */
+#endif
 	SIOUXSettings.asktosaveonclose = 0;
 	SIOUXSettings.showstatusline = 0;
 	SIOUXSettings.tabspaces = 4;
@@ -291,8 +298,11 @@
 
 	/* Get options from preference file (or from applet resource fork) */
 	PyMac_options.keep_console = POPT_KEEPCONSOLE_OUTPUT;		/* default-default */
+	PyMac_options.unixnewlines = 1;
+#if !TARGET_API_MAC_OSX
 	PyMac_PreferenceOptions(&PyMac_options);
-	
+#endif
+
 	if ( embedded ) {
 		static char *emb_argv[] = {"embedded-python", 0};
 		
@@ -301,6 +311,7 @@
 	} else {
 		/* Create argc/argv. Do it before we go into the options event loop. */
 		*argcp = PyMac_GetArgv(argvp, PyMac_options.noargs);
+#if !TARGET_API_MAC_OSX
 #ifndef NO_ARGV0_CHDIR
 		if (*argcp >= 1 && (*argvp)[0] && (*argvp)[0][0]) {
 			/* Workaround for MacOS X, which currently (DP4) doesn't set
@@ -314,6 +325,7 @@
 			chdir(app_wd);
 		}
 #endif
+#endif
 		/* Do interactive option setting, if allowed and <option> depressed */
 		PyMac_InteractiveOptions(&PyMac_options, argcp, argvp);
 	}
@@ -326,6 +338,7 @@
 	Py_NoSiteFlag = PyMac_options.nosite;
 	Py_TabcheckFlag = PyMac_options.tabwarn;
 	Py_DivisionWarningFlag = PyMac_options.divisionwarn;
+#if !TARGET_API_MAC_OSX
 	if ( PyMac_options.noargs ) {
 		/* don't process events at all without the scripts permission */
 		PyMacSchedParams scp;
@@ -335,7 +348,7 @@
 		/* Should we disable command-dot as well? */
 		PyMac_SetSchedParams(&scp);
 	}
-	/* XXXX dispatch oldexc and nosite */
+#endif /* !TARGET_API_MAC_OSX */
 
 	/* Set buffering */
 	if (PyMac_options.unbuffered) {
@@ -363,7 +376,7 @@
 ** Inspection mode after script/applet termination
 */
 static int
-run_inspect()
+run_inspect(void)
 {
 	int sts = 0;
 	
@@ -378,7 +391,7 @@
 ** if available on this machine.
 */
 static void
-PyMac_InstallNavServicesForSF()
+PyMac_InstallNavServicesForSF(void)
 {
 	if ( !PyMac_options.nonavservice ) {
 		PyObject *m = PyImport_ImportModule("macfsn");
@@ -401,7 +414,7 @@
 
 /* Run a compiled Python Python script from 'PYC ' resource __main__ */
 static int
-run_main_resource()
+run_main_resource(void)
 {
 	Handle h;
 	long size;
@@ -434,7 +447,7 @@
 
 /* Initialization sequence for applets */
 void
-PyMac_InitApplet()
+PyMac_InitApplet(void)
 {
 	int argc;
 	char **argv;
@@ -460,7 +473,7 @@
 ** Hook for embedding python.
 */
 void
-PyMac_Initialize()
+PyMac_Initialize(void)
 {
 	int argc;
 	char **argv;
@@ -473,9 +486,25 @@
 
 #endif /* USE_MAC_APPLET_SUPPORT */
 
+#if TARGET_API_MAC_OSX
+int
+main(int argc, char **argv)
+{
+	int i;
+	printf("first argc=%d\n", argc);
+	for(i=0; i<argc; i++) printf("first argv[%d] = \"%s\"\n", i, argv[i]);
+	init_common(&argc, &argv, 0);
+	printf("second argc=%d\n", argc);
+	for(i=0; i<argc; i++) printf("second argv[%d] = \"%s\"\n", i, argv[i]);
+	Py_Main(argc, argv);
+	return 0;
+}
+
+#else
+
 /* For normal application */
 void
-PyMac_InitApplication()
+PyMac_InitApplication(void)
 {
 	int argc;
 	char **argv;
@@ -505,13 +534,12 @@
 	}
 	Py_Main(argc, argv);
 }
+#endif /* TARGET_API_MAC_OSX */
 
 /* Main program */
 
 static void
-Py_Main(argc, argv)
-	int argc;
-	char **argv;
+Py_Main(int argc, char **argv)
 {
 	int sts;
 	char *command = NULL;
@@ -521,7 +549,7 @@
 	filename = argv[1];
 
 	if (Py_VerboseFlag ||
-	    command == NULL && filename == NULL && isatty((int)fileno(fp)))
+	    (command == NULL && filename == NULL && isatty((int)fileno(fp))))
 		fprintf(stderr, "Python %s on %s\n%s\n",
 			Py_GetVersion(), Py_GetPlatform(), COPYRIGHT);
 	
@@ -533,9 +561,11 @@
 		}
 	}
 	
+#if !TARGET_API_MAC_OSX
 	/* We initialize the menubar here, hoping SIOUX is initialized by now */
 	PyMac_InitMenuBar();
-	
+#endif
+
 	Py_Initialize();
 	
 	PyUnicode_SetDefaultEncoding(PyMac_getscript());
@@ -564,11 +594,12 @@
 	/*NOTREACHED*/
 }
 
+#if !TARGET_API_MAC_OSX
 /*
 ** Reset the "unseen output" flag
 */
 void
-PyMac_OutputSeen()
+PyMac_OutputSeen(void)
 {
 	if ( console_output_state == STATE_UNKNOWN )
 		PyMac_InitMenuBar();
@@ -579,7 +610,7 @@
 ** Set the "unseen output" flag
 */
 void
-PyMac_OutputNotSeen()
+PyMac_OutputNotSeen(void)
 {
 	if ( console_output_state == STATE_UNKNOWN )
 		PyMac_InitMenuBar();
@@ -590,20 +621,22 @@
 ** Override abort() - The default one is not what we want.
 */
 void
-abort()
+abort(void)
 {
 	console_output_state = STATE_LASTWRITE;
 	PyMac_Exit(1);
 }
+#endif /* !TARGET_API_MAC_OSX */
 
 /*
 ** Terminate application
 */
 void
-PyMac_Exit(status)
-	int status;
+PyMac_Exit(int status)
 {
+#ifdef USE_SIOUX
 	int keep = 0;
+#endif
 
 #if __profile__ == 1
 	ProfilerDump("\pPython Profiler Results");
@@ -649,14 +682,7 @@
 	exit(status);
 }
 
-/* Return the program name -- some code out there needs this. */
-char *
-Py_GetProgramFullPath()
-{
-	return orig_argv[0];
-}
-
-
+#if !TARGET_API_MAC_OSX
 /* Make the *original* argc/argv available to other modules.
    This is rare, but it is needed by the secureware extension. */
 
@@ -666,23 +692,31 @@
 	*argc = orig_argc;
 	*argv = orig_argv;
 }
+#endif
 
 /* More cruft that shouldn't really be here, used in sysmodule.c */
+#if !TARGET_API_MAC_OSX
+/* Return the program name -- some code out there needs this. */
+char *
+Py_GetProgramFullPath(void)
+{
+	return orig_argv[0];
+}
 
 char *
-Py_GetPrefix()
+Py_GetPrefix(void)
 {
 	return PyMac_GetPythonDir();
 }
 
 char *
-Py_GetExecPrefix()
+Py_GetExecPrefix(void)
 {
 	return PyMac_GetPythonDir();
 }
 
 int
-PyMac_GetDelayConsoleFlag()
+PyMac_GetDelayConsoleFlag(void)
 {
 	return (int)PyMac_options.delayconsole;
 }
@@ -705,4 +739,5 @@
 			*p = '\r';
 }
 #endif /* WITHOUT_UNIX_NEWLINES */
+#endif /* !TARGET_API_MAC_OSX */