From 09f99d3f446170c2a816243f855d8fdd5cbc5aef Mon Sep 17 00:00:00 2001
From: Jim Kingdon <jkingdon@engr.sgi.com>
Date: Thu, 10 Feb 2000 20:06:32 +0000
Subject: [PATCH] 	* defs.h (MERGEPID): Added.  Patch submitted by Andrew
 Hobson and 	approved by Michael Snyder.

---
 gdb/ChangeLog | 5 +++++
 gdb/defs.h    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dce58ac3308..845a5bed933 100644
--- 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 f7b627c0c6b..ba958c7dbfc 100644
--- 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