diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-04-29 17:30:47 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-04-29 17:30:47 +0000 |
| commit | dfa2e43a8fa51fdf6d3cc7083a07e230b7d4ab68 (patch) | |
| tree | dc68d19ac17c5f59c974d9f34ebdd39ddcf793a8 /cpp/src/IcePatch/Util.cpp | |
| parent | fixing VC error (diff) | |
| download | ice-dfa2e43a8fa51fdf6d3cc7083a07e230b7d4ab68.tar.bz2 ice-dfa2e43a8fa51fdf6d3cc7083a07e230b7d4ab68.tar.xz ice-dfa2e43a8fa51fdf6d3cc7083a07e230b7d4ab68.zip | |
fixes
Diffstat (limited to 'cpp/src/IcePatch/Util.cpp')
| -rw-r--r-- | cpp/src/IcePatch/Util.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/cpp/src/IcePatch/Util.cpp b/cpp/src/IcePatch/Util.cpp index 04c830bc41a..8bc4e4c8f72 100644 --- a/cpp/src/IcePatch/Util.cpp +++ b/cpp/src/IcePatch/Util.cpp @@ -14,14 +14,24 @@ #include <openssl/md5.h> #include <bzlib.h> -#ifndef _WIN32 -# include <unistd.h> -# include <dirent.h> -#else +#ifdef _WIN32 # include <direct.h> # include <io.h> # define S_ISDIR(mode) ((mode) & _S_IFDIR) # define S_ISREG(mode) ((mode) & _S_IFREG) +#else +# include <unistd.h> +# include <dirent.h> +#endif + +// +// Stupid Visual C++ defines min and max as macros :-( +// +#ifdef min +# undef min +#endif +#ifdef max +# undef max #endif using namespace std; @@ -622,7 +632,6 @@ IcePatch::getRegular(const RegularPrx& regular, ProgressCB& progressCB) { break; } - sleep(1); posBZ2 += bytesBZ2.size(); |