* exec.c (xfer_memory): Add attrib argument.

[deliverable/binutils-gdb.git] / gdb / fork-child.c

diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index 03f6fe22ba7fc070b7488c185309962829c65c0b..e97f451bcec380b3b9fc6926c9beeeeadc3b417a 100644 (file)
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -244,13 +244,13 @@ fork_inferior (char *exec_file, char *allargs, char **env,
   if (pre_trace_fun != NULL)
     (*pre_trace_fun) ();
 
-#if defined(USG) && !defined(HAVE_VFORK)
-  pid = fork ();
-#else
+#ifdef HAVE_VFORK
   if (debug_fork)
     pid = fork ();
   else
     pid = vfork ();
+#else
+  pid = fork ();
 #endif
 
   if (pid < 0)
@@ -358,7 +358,7 @@ fork_inferior (char *exec_file, char *allargs, char **env,
      correct program, and are poised at the first instruction of the
      new program.  */
 
-  /* Allow target dependant code to play with the new process.  This might be
+  /* Allow target dependent code to play with the new process.  This might be
      used to have target-specific code initialize a variable in the new process
      prior to executing the first instruction.  */
   TARGET_CREATE_INFERIOR_HOOK (pid);
@@ -416,13 +416,13 @@ clone_and_follow_inferior (int child_pid, int *followed_child)
     error ("error getting pipe for handoff semaphore");
 
   /* Clone the debugger. */
-#if defined(USG) && !defined(HAVE_VFORK)
-  debugger_pid = fork ();
-#else
+#ifdef HAVE_VFORK
   if (debug_fork)
     debugger_pid = fork ();
   else
     debugger_pid = vfork ();
+#else
+  debugger_pid = fork ();
 #endif
 
   if (debugger_pid < 0)