diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2004-02-10 22:49:17 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2004-02-10 22:49:17 +0000 |
| commit | 65bd3b16fd027e3e76f9a38e60b99b07773728e7 (patch) | |
| tree | 7d9692f460e5e97cfa39600c35ce0b05d006afb4 /cpp | |
| parent | file Process.ice was initially added on branch process_registry. (diff) | |
| download | ice-65bd3b16fd027e3e76f9a38e60b99b07773728e7.tar.bz2 ice-65bd3b16fd027e3e76f9a38e60b99b07773728e7.tar.xz ice-65bd3b16fd027e3e76f9a38e60b99b07773728e7.zip | |
Fixed Win32 build (_win9x -> win9x())
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Glacier/GlacierStarter.cpp | 2 | ||||
| -rwxr-xr-x | cpp/src/Ice/Service.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/IcePack/IcePackNode.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IcePack/IcePackRegistry.cpp | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/cpp/src/Glacier/GlacierStarter.cpp b/cpp/src/Glacier/GlacierStarter.cpp index dd2c61ac25d..2bb116a574b 100644 --- a/cpp/src/Glacier/GlacierStarter.cpp +++ b/cpp/src/Glacier/GlacierStarter.cpp @@ -218,7 +218,7 @@ Glacier::StarterService::usage(const string& appName) "-h, --help Show this message.\n" "-v, --version Display the Ice version."; #ifdef _WIN32 - if(!_win9x) + if(!win9x()) { options.append( "\n" diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp index ba0ca3e0817..e0ac600e66a 100755 --- a/cpp/src/Ice/Service.cpp +++ b/cpp/src/Ice/Service.cpp @@ -363,6 +363,12 @@ Ice::Service::trace(const std::string& msg) const #ifdef _WIN32 bool +Ice::Service::win9x() const +{ + return _win9x; +} + +bool Ice::Service::checkService(int argc, char* argv[], int& status) { if(_win9x) diff --git a/cpp/src/IcePack/IcePackNode.cpp b/cpp/src/IcePack/IcePackNode.cpp index 27bdccc4643..9bf09710a4f 100644 --- a/cpp/src/IcePack/IcePackNode.cpp +++ b/cpp/src/IcePack/IcePackNode.cpp @@ -505,7 +505,7 @@ IcePack::NodeService::usage(const string& appName) " Deploy descriptor in file DESCRIPTOR, with\n" " optional targets."; #ifdef _WIN32 - if(!_win9x) + if(!win9x()) { options.append( "\n" diff --git a/cpp/src/IcePack/IcePackRegistry.cpp b/cpp/src/IcePack/IcePackRegistry.cpp index 34c587ad7d4..e353b95c902 100644 --- a/cpp/src/IcePack/IcePackRegistry.cpp +++ b/cpp/src/IcePack/IcePackRegistry.cpp @@ -91,7 +91,7 @@ IcePack::RegistryService::usage(const string& appName) "-v, --version Display the Ice version.\n" "--nowarn Don't print any security warnings."; #ifdef _WIN32 - if(!_win9x) + if(!win9x()) { options.append( "\n" |