diff options
Diffstat (limited to 'cpp/src/IcePatch2/FileServerI.cpp')
| -rwxr-xr-x | cpp/src/IcePatch2/FileServerI.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp index daec1f2216a..666b8d121de 100755 --- a/cpp/src/IcePatch2/FileServerI.cpp +++ b/cpp/src/IcePatch2/FileServerI.cpp @@ -106,7 +106,7 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp } if( -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#if defined(_MSC_VER) _lseek(fd, static_cast<off_t>(pos), SEEK_SET) #else lseek(fd, static_cast<off_t>(pos), SEEK_SET) @@ -127,13 +127,7 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp IceUtil::ScopedArray<Byte> bytes(new Byte[num]); #ifdef _WIN32 int r; - if((r = -#if defined(_MSC_VER) && (_MSC_VER >= 1400) - _read(fd, bytes.get(), static_cast<unsigned int>(num)) -#else - read(fd, bytes.get(), static_cast<unsigned int>(num)) -#endif - ) == -1) + if((r = _read(fd, bytes.get(), static_cast<unsigned int>(num))) == -1) #else ssize_t r; if((r = read(fd, bytes.get(), static_cast<size_t>(num))) == -1) |