Index: gdb-8.2/gdb/gnu-nat.c
===================================================================
--- gdb-8.2.orig/gdb/gnu-nat.c
+++ gdb-8.2/gdb/gnu-nat.c
@@ -45,6 +45,14 @@ extern "C"
 #include <portinfo.h>
 }
 
+#ifdef __STDC_LIMIT_MACROS
+#undef __STDC_LIMIT_MACROS
+#endif
+
+#ifdef __STDC_CONSTANT_MACROS
+#undef __STDC_CONSTANT_MACROS
+#endif
+
 #include "defs.h"
 
 #include <ctype.h>
@@ -2264,7 +2272,7 @@ gnu_nat_target::attach (const char *args
 void
 gnu_nat_target::detach (inferior *inf, int from_tty)
 {
-  int pid;
+  int pid = -1;
 
   if (from_tty)
     {
@@ -2283,9 +2291,10 @@ gnu_nat_target::detach (inferior *inf, i
   inf_detach (gnu_current_inf);
 
   inferior_ptid = null_ptid;
-  detach_inferior (pid);
+  detach_inferior (inf);
 
-  inf_child_maybe_unpush_target (ops);
+  //  inf_child_maybe_unpush_target (ops);
+  maybe_unpush_target ();
 }