diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
| commit | 0ba8eea655a5e40d19ab95c773192b5d908c5a61 (patch) | |
| tree | 4c2c97ade1ab197d361c146bacae5adde55986bf /src/google/protobuf/io/zero_copy_stream_impl.cc | |
| parent | 92a7e778e7394386f413cec28d67a07630f784b1 (diff) | |
| parent | a711e3d5b4ee1dd7f9d21197dca8432a5819a64e (diff) | |
Merge branch 'master' into down-integrate
Diffstat (limited to 'src/google/protobuf/io/zero_copy_stream_impl.cc')
| -rw-r--r-- | src/google/protobuf/io/zero_copy_stream_impl.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/google/protobuf/io/zero_copy_stream_impl.cc b/src/google/protobuf/io/zero_copy_stream_impl.cc index 83dec3e6..dd921135 100644 --- a/src/google/protobuf/io/zero_copy_stream_impl.cc +++ b/src/google/protobuf/io/zero_copy_stream_impl.cc @@ -56,9 +56,6 @@ namespace io { // Win32 lseek is broken: If invoked on a non-seekable file descriptor, its // return value is undefined. We re-define it to always produce an error. #define lseek(fd, offset, origin) ((off_t)-1) -#endif - -#ifdef _MSC_VER // DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import // them like we do below. using google::protobuf::internal::win32::access; |