diff options
| author | Jose <jose@zeroc.com> | 2009-08-12 17:59:22 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2009-08-12 17:59:22 +0200 |
| commit | e33a0af8f6fef372c9f8bec22629b1460d2e8c70 (patch) | |
| tree | 67c9e68437084d255a3725dd08092f5892023b26 /cpp/src/IcePatch2/FileServerI.cpp | |
| parent | 2564 - removeServantLocator remaining issues. (diff) | |
| download | ice-e33a0af8f6fef372c9f8bec22629b1460d2e8c70.tar.bz2 ice-e33a0af8f6fef372c9f8bec22629b1460d2e8c70.tar.xz ice-e33a0af8f6fef372c9f8bec22629b1460d2e8c70.zip | |
4071 - merge contents of OS.cpp/OS.h into FileUtil.h/FileUtil.cpp.
Diffstat (limited to 'cpp/src/IcePatch2/FileServerI.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/FileServerI.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp index 7d2c735d174..858eb449a6e 100644 --- a/cpp/src/IcePatch2/FileServerI.cpp +++ b/cpp/src/IcePatch2/FileServerI.cpp @@ -12,7 +12,6 @@ #include <IceUtil/ScopedArray.h> #include <IceUtil/Unicode.h> #include <IcePatch2/FileServerI.h> -#include <OS.h> #ifdef _WIN32 # include <io.h> @@ -92,7 +91,7 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp return; } - int fd = IceInternal::OS::open(_dataDir + '/' + path + ".bz2", O_RDONLY|O_BINARY); + int fd = IceUtilInternal::open(_dataDir + '/' + path + ".bz2", O_RDONLY|O_BINARY); if(fd == -1) { FileAccessException ex; |