aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/procfs.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e5ca498..1862fed 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 16 19:00:02 2000 Andrew Cagney <cagney@b1.cygnus.com>
+
+ From 2000-01-26 Rodney Brown <RodneyBrown@pmsc.com>:
+ * procfs.c: Define MERGEPID if not defined. For osf4.0e.
+
2000-02-15 Jason Molenda (jsm@bugshack.cygnus.com)
* Makefile.in (diststuff): Run 'diststuff' in doc/ subdir, not
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 920019f..b108078 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -293,6 +293,8 @@ typedef prstatus_t gdb_lwpstatus_t;
#ifndef PIDGET
#define PIDGET(PID) (PID)
#define TIDGET(PID) (PID)
+#endif
+#ifndef MERGEPID
#define MERGEPID(PID, TID) (PID)
#endif