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.

sys/mac/macerrs.c

@@ -9,9 +9,11 @@
 
 #include "hack.h"
 #include "macwin.h"
+#if !TARGET_API_MAC_CARBON
 #include <Dialogs.h>
 #include <TextUtils.h>
 #include <Resources.h>
+#endif
 
 
 void error(const char *format,...)