diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-11-28 19:20:43 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-11-28 19:20:43 +0000 |
| commit | 65784376867894c8dadd9785a6b5fc9deab99094 (patch) | |
| tree | 87f81e0bb1f0a9246d20d3f3439184018970cb3e /cpp/src/IcePatch2/Util.cpp | |
| parent | Fixed potential memory leak (diff) | |
| download | ice-65784376867894c8dadd9785a6b5fc9deab99094.tar.bz2 ice-65784376867894c8dadd9785a6b5fc9deab99094.tar.xz ice-65784376867894c8dadd9785a6b5fc9deab99094.zip | |
Fixed bug where the icegridnode wouldn't start on boot as a Windows
service.
Fixed compilation error with IcePatch2 and Visual C++ 6.0.
Diffstat (limited to 'cpp/src/IcePatch2/Util.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/Util.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/IcePatch2/Util.cpp b/cpp/src/IcePatch2/Util.cpp index 95479095586..375ce122de9 100644 --- a/cpp/src/IcePatch2/Util.cpp +++ b/cpp/src/IcePatch2/Util.cpp @@ -465,7 +465,11 @@ IcePatch2::readDirectory(const string& pa) #ifdef _WIN32 struct _finddata_t data; +#if defined(_MSC_VER) && (_MSC_VER < 1300) + long h = _findfirst(simplify((path + "/*")).c_str(), &data); +#else intptr_t h = _findfirst(simplify((path + "/*")).c_str(), &data); +#endif if(h == -1) { throw "cannot read directory `" + path + "':\n" + lastError(); |