* defs.h (MERGEPID): Added. Patch submitted by Andrew Hobson and

	approved by Michael Snyder.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dce58ac..845a5be 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-10  Jim Kingdon  <kingdon@redhat.com>
+
+       * defs.h (MERGEPID): Added.  Patch submitted by Andrew Hobson and
+       approved by Michael Snyder.
+
 2000-02-09  Mark Kettenis  <kettenis@gnu.org>
 
         * linux-thread.c: Include defs.h before gdb_wait.h.

diff --git a/gdb/defs.h b/gdb/defs.h
index f7b627c..ba958c7 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -1218,6 +1218,7 @@ extern int use_windows;
 #ifndef PIDGET
 #define PIDGET(PID) (PID)
 #define TIDGET(PID) 0
+#define MERGEPID(PID, TID) (PID)
 #endif
 
 /* If under Cygwin, provide backwards compatibility with older