summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2002-08-05 14:13:31 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2002-08-05 14:13:31 (GMT)
commitace9d955b0329558005a88f5711de12e96b356c4 (patch)
tree741c9f3951c5c3ba74100b6e8dfc95f8b4385303
parent3bd3fedeca7efdb91788ce5c5862f92f7315e6e9 (diff)
downloadcpython-ace9d955b0329558005a88f5711de12e96b356c4.zip
cpython-ace9d955b0329558005a88f5711de12e96b356c4.tar.gz
cpython-ace9d955b0329558005a88f5711de12e96b356c4.tar.bz2
Renamed Py_Main to PyMac_Main as it has a different signature than the "normal" Py_Main, and that signature has appeared in a .h file.
-rw-r--r--Mac/Python/macmain.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
index c703cdc..9e5a300 100644
--- a/Mac/Python/macmain.c
+++ b/Mac/Python/macmain.c
@@ -86,7 +86,7 @@ int console_output_state = STATE_UNKNOWN;
PyMac_PrefRecord PyMac_options;
-static void Py_Main(int, char **, char *); /* Forward */
+static void PyMac_Main(int, char **, char *); /* Forward */
void PyMac_Exit(int); /* Forward */
/* Initialize the Mac toolbox world */
@@ -537,7 +537,7 @@ main(int argc, char **argv)
}
- Py_Main(argc, argv, script);
+ PyMac_Main(argc, argv, script);
return 0;
}
@@ -580,14 +580,14 @@ PyMac_InitApplication(void)
exit(0);
}
}
- Py_Main(argc, argv, script);
+ PyMac_Main(argc, argv, script);
}
#endif /* TARGET_API_MAC_OSX */
/* Main program */
static void
-Py_Main(int argc, char **argv, char *filename)
+PyMac_Main(int argc, char **argv, char *filename)
{
int sts;
char *command = NULL;