From 20de27fa7ed8ba789c0859b8e858610419fcb2c6 Mon Sep 17 00:00:00 2001 From: Matthew Newhook Date: Fri, 16 Dec 2005 17:16:05 +0000 Subject: http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=679 --- cpp/src/IcePatch2/FileServerI.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'cpp/src/IcePatch2/FileServerI.cpp') diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp index eac1790deba..e5b100b76f2 100644 --- a/cpp/src/IcePatch2/FileServerI.cpp +++ b/cpp/src/IcePatch2/FileServerI.cpp @@ -8,10 +8,9 @@ // ********************************************************************** #include +#include #include -#include -#include -#include +#include #ifdef _WIN32 # include @@ -86,11 +85,7 @@ IcePatch2::FileServerI::getFileCompressed(const string& pa, Int pos, Int num, co return ByteSeq(); } -#ifdef _WIN32 - int fd = open((_dataDir + '/' + path + ".bz2").c_str(), _O_RDONLY | _O_BINARY); -#else - int fd = open((_dataDir + '/' + path + ".bz2").c_str(), O_RDONLY); -#endif + int fd = OS::open(_dataDir + '/' + path + ".bz2", O_RDONLY|O_BINARY); if(fd == -1) { FileAccessException ex; -- cgit v1.2.3