This is the mail archive of the gdb-cvs@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] Fix Cygwin compilation after target_ops C++ conversion.


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6af79d7b5a21a40c4036541fbfa821f9d1260ebf

commit 6af79d7b5a21a40c4036541fbfa821f9d1260ebf
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sat Jul 14 12:17:29 2018 +0100

    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:
---
 gdb/ChangeLog     | 5 +++++
 gdb/windows-nat.c | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6e80efd..8a63224 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 e0e422c..aea5026 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);


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]