summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch2/FileServerI.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2005-11-21 16:32:10 +0000
committerBernard Normier <bernard@zeroc.com>2005-11-21 16:32:10 +0000
commitdeda1e21772f8efcaf91baab3a9e896c471b0f32 (patch)
treeaf0c168df9becd8ea00db08afb7fc04bf46dd9cd /cpp/src/IcePatch2/FileServerI.cpp
parentFixed dependencies (diff)
downloadice-deda1e21772f8efcaf91baab3a9e896c471b0f32.tar.bz2
ice-deda1e21772f8efcaf91baab3a9e896c471b0f32.tar.xz
ice-deda1e21772f8efcaf91baab3a9e896c471b0f32.zip
Windows x64 port
Diffstat (limited to 'cpp/src/IcePatch2/FileServerI.cpp')
-rw-r--r--cpp/src/IcePatch2/FileServerI.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp
index bb7ef6d203f..eac1790deba 100644
--- a/cpp/src/IcePatch2/FileServerI.cpp
+++ b/cpp/src/IcePatch2/FileServerI.cpp
@@ -112,11 +112,12 @@ IcePatch2::FileServerI::getFileCompressed(const string& pa, Int pos, Int num, co
ByteSeq bytes(num);
#ifdef _WIN32
- long r;
+ int r;
+ if((r = read(fd, &bytes[0], static_cast<unsigned int>(num))) == -1)
#else
ssize_t r;
-#endif
if((r = read(fd, &bytes[0], static_cast<size_t>(num))) == -1)
+#endif
{
close(fd);