mirror of
https://github.com/python/cpython
synced 2024-09-23 09:15:50 +00:00
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.
This commit is contained in:
parent
3bd3fedeca
commit
ace9d955b0
|
@ -86,7 +86,7 @@ int console_output_state = STATE_UNKNOWN;
|
||||||
|
|
||||||
PyMac_PrefRecord PyMac_options;
|
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 */
|
void PyMac_Exit(int); /* Forward */
|
||||||
|
|
||||||
/* Initialize the Mac toolbox world */
|
/* 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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -580,14 +580,14 @@ PyMac_InitApplication(void)
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Py_Main(argc, argv, script);
|
PyMac_Main(argc, argv, script);
|
||||||
}
|
}
|
||||||
#endif /* TARGET_API_MAC_OSX */
|
#endif /* TARGET_API_MAC_OSX */
|
||||||
|
|
||||||
/* Main program */
|
/* Main program */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
Py_Main(int argc, char **argv, char *filename)
|
PyMac_Main(int argc, char **argv, char *filename)
|
||||||
{
|
{
|
||||||
int sts;
|
int sts;
|
||||||
char *command = NULL;
|
char *command = NULL;
|
||||||
|
|
Loading…
Reference in a new issue