[SCM] archer-jankratochvil-watchpoint3: Merge branch 'f-cleanup-fork-multifix' into archer-jankratochvil-watchpoint3

[jkratoch@sourceware.org]

The branch, archer-jankratochvil-watchpoint3 has been updated
       via  74a9c6ed99a4ca7f4983b6b33e5bf2a0ced2388a (commit)
       via  548f50b92ed7b940d3a489cba916260cb82e5b70 (commit)
       via  6db103e4e7f86fefcee3c62067fc0499c3b6f9a2 (commit)
      from  fe68a8c899120cb2b1c03ebc426ee64d2c94eec3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 74a9c6ed99a4ca7f4983b6b33e5bf2a0ced2388a
Merge: fe68a8c 548f50b
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Dec 26 21:32:28 2011 +0100

    Merge branch 'f-cleanup-fork-multifix' into archer-jankratochvil-watchpoint3

commit 548f50b92ed7b940d3a489cba916260cb82e5b70
Merge: c0045e7 6db103e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Dec 26 21:32:25 2011 +0100

    Merge branch 'f-cleanup-fork' into f-cleanup-fork-multifix

commit 6db103e4e7f86fefcee3c62067fc0499c3b6f9a2
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Dec 26 21:32:15 2011 +0100

    Fix RHEL-4 compatibility - pid_t.

-----------------------------------------------------------------------

Summary of changes:
 gdb/testsuite/gdb.threads/watchpoint-fork-child.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

First 500 lines of diff:
diff --git a/gdb/testsuite/gdb.threads/watchpoint-fork-child.c b/gdb/testsuite/gdb.threads/watchpoint-fork-child.c
index a2ad29a..e6c39cf 100644
--- a/gdb/testsuite/gdb.threads/watchpoint-fork-child.c
+++ b/gdb/testsuite/gdb.threads/watchpoint-fork-child.c
@@ -28,6 +28,8 @@
 
 #include "watchpoint-fork.h"
 
+/* `pid_t' may not be available.  */
+
 static volatile int usr1_got;
 
 static void
@@ -39,7 +41,7 @@ handler_usr1 (int signo)
 void
 forkoff (int nr)
 {
-  pid_t child, save_parent = getpid ();
+  int child, save_parent = getpid ();
   int i;
   struct sigaction act, oldact;
 #ifdef THREAD


hooks/post-receive
--
Repository for Project Archer.