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.

util/dgn_main.c

@@ -11,6 +11,11 @@
 #include "config.h"
 #include "dlb.h"
 
+/* Macintosh-specific code */
+#if defined(__APPLE__) && defined(__MACH__)
+  /* MacOS X has Unix-style files and processes */
+# undef MAC
+#endif
 #ifdef MAC
 # if defined(__SC__) || defined(__MRC__)
 #  define MPWTOOL

util/lev_main.c

@@ -20,9 +20,11 @@
 # if defined(__SC__) || defined(__MRC__)
 #  define MPWTOOL
 #  define PREFIX ":dungeon:"	/* place output files here */
-#include <CursorCtl.h>
+#  include <CursorCtl.h>
 # else
-#  define PREFIX ":lib:"	/* place output files here */
+#  if !defined(__MACH__)
+#   define PREFIX ":lib:"	/* place output files here */
+#  endif
 # endif
 #endif
 

util/makedefs.c

@@ -78,7 +78,8 @@ static	const char	SCCS_Id[] = "@(#)makedefs.c\t3.4\t2002/02/03";
 # define DATA_TEMPLATE		"NH:slib/%s"
 # define DATA_IN_TEMPLATE	"NH:dat/%s"
 #else /* not AMIGA */
-# ifdef MAC
+# if defined(MAC) && !defined(__MACH__)
+    /* MacOS 9 or earlier */
 #   define INCLUDE_TEMPLATE	":include:%s"
 #   define SOURCE_TEMPLATE	":src:%s"
 #   define DGN_TEMPLATE		":dat:%s"  /* where dungeon.pdf file goes */