comparison Mac/Python/macmain.c @ 24564:0bb3986cf653 legacy-trunk

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.
author Jack Jansen <jack.jansen@cwi.nl>
date Mon, 05 Aug 2002 14:13:31 +0000
parents 7bc31ad9477c
children 74d1ad61f843
comparison
equal deleted inserted replaced
24563:479f8f4ee4ad 24564:0bb3986cf653
84 #define STATE_LASTWRITE 2 84 #define STATE_LASTWRITE 2
85 int console_output_state = STATE_UNKNOWN; 85 int console_output_state = STATE_UNKNOWN;
86 86
87 PyMac_PrefRecord PyMac_options; 87 PyMac_PrefRecord PyMac_options;
88 88
89 static void Py_Main(int, char **, char *); /* Forward */ 89 static void PyMac_Main(int, char **, char *); /* Forward */
90 void PyMac_Exit(int); /* Forward */ 90 void PyMac_Exit(int); /* Forward */
91 91
92 /* Initialize the Mac toolbox world */ 92 /* Initialize the Mac toolbox world */
93 93
94 static void 94 static void
535 535
536 init_common(&argc, &argv, 0); 536 init_common(&argc, &argv, 0);
537 537
538 } 538 }
539 539
540 Py_Main(argc, argv, script); 540 PyMac_Main(argc, argv, script);
541 return 0; 541 return 0;
542 } 542 }
543 543
544 #else 544 #else
545 545
578 if ( filetype != 'TEXT' && filetype != 0 ) { 578 if ( filetype != 'TEXT' && filetype != 0 ) {
579 Alert(NOTASCRIPT_ID, NULL); 579 Alert(NOTASCRIPT_ID, NULL);
580 exit(0); 580 exit(0);
581 } 581 }
582 } 582 }
583 Py_Main(argc, argv, script); 583 PyMac_Main(argc, argv, script);
584 } 584 }
585 #endif /* TARGET_API_MAC_OSX */ 585 #endif /* TARGET_API_MAC_OSX */
586 586
587 /* Main program */ 587 /* Main program */
588 588
589 static void 589 static void
590 Py_Main(int argc, char **argv, char *filename) 590 PyMac_Main(int argc, char **argv, char *filename)
591 { 591 {
592 int sts; 592 int sts;
593 char *command = NULL; 593 char *command = NULL;
594 FILE *fp = stdin; 594 FILE *fp = stdin;
595 595