* mpw-config.in (MacSerial.h): Duplicate from standard Serial.h.

	* ser-mac.c (MacSerial.h): Include instead of Serial.h.

diff --git a/gdb/ChangeLog.mpw b/gdb/ChangeLog.mpw
index 2a12d421e024e22538f6fb7fb9688ee7d6186fc0..f75b00278c438731e1593b4f8e71fda945e82e4f 100644 (file)
--- a/gdb/ChangeLog.mpw
+++ b/gdb/ChangeLog.mpw
@@ -1,3 +1,8 @@
+Fri Jul  1 11:40:24 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+       * mpw-config.in (MacSerial.h): Duplicate from standard Serial.h.
+       * ser-mac.c (MacSerial.h): Include instead of Serial.h.
+
 Wed Jun 29 18:04:55 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
        * mpw-make.in: Use {s} instead of {srcdir} everywhere.

diff --git a/gdb/mpw-config.in b/gdb/mpw-config.in
index d86bd7a6d63846e6539d086bac22415928bb22d8..d6da2ba80c4f3242c000c232641a97c2458141fd 100644 (file)
--- a/gdb/mpw-config.in
+++ b/gdb/mpw-config.in
@@ -4,6 +4,11 @@ forward-include "{srcdir}"config:m68k:xm-mpw.h xm.h
 
 forward-include "{srcdir}"config:m68k:xm-m68k.h 'm68k/xm-m68k.h'
 
+# Make a copy of this file and give it a different name, so it
+# won't be confused with GDB's serial.h.
+
+Duplicate -y "{MPW}"Interfaces:CIncludes:Serial.h MacSerial.h
+
 Echo "/* dummy */" >termio.h
 
 Set xdepfiles   " "

diff --git a/gdb/ser-mac.c b/gdb/ser-mac.c
index d502ad1ef526cbaa0287297734461798fc89bccf..95c2481cf54e5ee888cb303e32fc6415ad47dfec 100644 (file)
--- a/gdb/ser-mac.c
+++ b/gdb/ser-mac.c
@@ -23,7 +23,9 @@
 
 #include <Types.h>
 #include <Devices.h>
-#include <Serial.h>
+/* This is the regular Mac Serial.h, but copied to a different name
+   so as not to get confused with the GDB serial.h above.  */
+#include "MacSerial.h"
 
 /* This is unused for now.  We just return a placeholder. */