From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat, 14 Jul 2018 11:17:29 +0000 (+0100)
Subject: Fix Cygwin compilation after target_ops C++ conversion.
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=6af79d7b5a21a40c4036541fbfa821f9d1260ebf;p=deliverable%2Fbinutils-gdb.git

Fix Cygwin compilation after target_ops C++ conversion.

After f6ac5f3d "Convert struct target_ops to C++", we need to explicitly use
the global namespace when calling ::close() from windows_nat_target methods,
as that object has a close() method.

gdb/ChangeLog:

2018-07-14  Jon Turney  <jon.turney@dronecode.org.uk>

	* windows-nat.c (windows_nat_target::create_inferior): Update to
	call close() in global namespace.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6e80efd4f0..8a63224ace 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-14  Jon Turney  <jon.turney@dronecode.org.uk>
+
+	* windows-nat.c (windows_nat_target::create_inferior): Update to
+	call close() in global namespace.
+
 2018-07-26  Tom Tromey  <tom@tromey.com>
 
 	* dwarf-index-write.c (add_address_entry): Don't add objfile
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index e0e422c0f0..aea502638e 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -2681,13 +2681,13 @@ windows_nat_target::create_inferior (const char *exec_file,
 
   if (tty >= 0)
     {
-      close (tty);
+      ::close (tty);
       dup2 (ostdin, 0);
       dup2 (ostdout, 1);
       dup2 (ostderr, 2);
-      close (ostdin);
-      close (ostdout);
-      close (ostderr);
+      ::close (ostdin);
+      ::close (ostdout);
+      ::close (ostderr);
     }
 #else  /* !__CYGWIN__ */
   allargs_len = strlen (allargs);