diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-12-16 17:16:05 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-12-16 17:16:05 +0000 |
| commit | 20de27fa7ed8ba789c0859b8e858610419fcb2c6 (patch) | |
| tree | 2ab9a32b38b2c95231d509d57302f544639c5b9d /cpp/src/IcePatch2/FileServerI.cpp | |
| parent | added file. (diff) | |
| download | ice-20de27fa7ed8ba789c0859b8e858610419fcb2c6.tar.bz2 ice-20de27fa7ed8ba789c0859b8e858610419fcb2c6.tar.xz ice-20de27fa7ed8ba789c0859b8e858610419fcb2c6.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=679
Diffstat (limited to 'cpp/src/IcePatch2/FileServerI.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/FileServerI.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
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 <IceUtil/DisableWarnings.h> +#include <IceUtil/Unicode.h> #include <IcePatch2/FileServerI.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> +#include <OS.h> #ifdef _WIN32 # include <io.h> @@ -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; |