Synch recent 3.4.2 changes to main trunk

This is merely a synchronization of recent changes for the Macintosh Carbon port, which were committed to the 3.4.2 branch, to the main trunk.
2003-08-30 00:45:58 +00:00
parent 2ea07652d8
commit 1282e5c623
24 changed files with 493 additions and 289 deletions
--- a/src/options.c
+++ b/src/options.c
@@ -484,7 +484,9 @@ const char *ev;
 void
 initoptions()
 {
+#ifndef MAC
 	char *opts;
+#endif
 	int i;

 	/* initialize the random number generator */