| commit | c27d6a5646bdc1f30f9d3eb9e516d2a4b265b839 | [log] [tgz] |
|---|---|---|
| author | Adam Cozzette <acozzette@google.com> | Tue Oct 02 15:43:17 2018 -0700 |
| committer | GitHub <noreply@github.com> | Tue Oct 02 15:43:17 2018 -0700 |
| tree | be73af2e8438b2fb3bf58ff437ed62c81f8ab53e | |
| parent | 8c1748f1cd76bead9a4a700e2d411e18b896a8cc [diff] | |
| parent | 703f11123a2c8d94494fe3fa030f5e8d1f2317da [diff] |
Merge pull request #5212 from GregTho/win32close Use ::_close rather than ::close in Win32 stubs.
diff --git a/src/google/protobuf/stubs/io_win32.cc b/src/google/protobuf/stubs/io_win32.cc index f00a268..d0f57df 100644 --- a/src/google/protobuf/stubs/io_win32.cc +++ b/src/google/protobuf/stubs/io_win32.cc
@@ -334,7 +334,7 @@ #endif } -int close(int fd) { return ::close(fd); } +int close(int fd) { return ::_close(fd); } int dup(int fd) { return ::_dup(fd); }