aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/protobuf
diff options
context:
space:
mode:
authorGravatar Jakob Buchgraber <buchgr@google.com>2017-05-02 15:24:56 +0200
committerGravatar Jakob Buchgraber <buchgr@google.com>2017-05-02 15:53:38 +0200
commit382b62c79808940349b81f4316203cdb5a0d0548 (patch)
tree850fce25280d3dd13f62e0d50b44c24d9a423c1a /third_party/protobuf
parentac7a7a82c59fad435fb4d38d9a37aefeaaa11fe3 (diff)
Apply @laszlocsomor's protobuf patch to fix build on windows.
This patch was taken from [1] and fixes a CI breakage on Windows. [1] https://github.com/google/protobuf/pull/2969/commits/14d2821157d047426c313759966d01f17b608c3a Change-Id: Ibec9c3580566f573c7b558fffa40844da5239108
Diffstat (limited to 'third_party/protobuf')
-rw-r--r--third_party/protobuf/3.2.0/src/google/protobuf/stubs/io_win32.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/third_party/protobuf/3.2.0/src/google/protobuf/stubs/io_win32.cc b/third_party/protobuf/3.2.0/src/google/protobuf/stubs/io_win32.cc
index b5f1cdf0b7..bffa450a26 100644
--- a/third_party/protobuf/3.2.0/src/google/protobuf/stubs/io_win32.cc
+++ b/third_party/protobuf/3.2.0/src/google/protobuf/stubs/io_win32.cc
@@ -251,14 +251,6 @@ int win32_mkdir(const char* path, int _mode) {
}
int win32_access(const char* path, int mode) {
- // _access/_waccess in <io.h> don't support checking for executability (nor is
- // X_OK defined).
- // They support checking for readability (but R_OK is not defined) but we
- // never use them for that in the protobuf source code.
- // Existence and writability check are also supported, but again F_OK and W_OK
- // aren't defined as constants in <io.h>; they are defined in io_win32.h
- // Therefore we only support F_OK and W_OK.
- assert(mode & ~(F_OK | W_OK) == 0);
wstring wpath;
if (!as_windows_path(path, MAX_PATH, &wpath)) {
errno = ENOENT;