aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog.mpw5
-rw-r--r--gdb/mpw-config.in5
-rw-r--r--gdb/ser-mac.c4
3 files changed, 13 insertions, 1 deletions
diff --git a/gdb/ChangeLog.mpw b/gdb/ChangeLog.mpw
index 2a12d42..f75b002 100644
--- 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 d86bd7a..d6da2ba 100644
--- 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 d502ad1..95c2481 100644
--- 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. */