summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier/GlacierStarter.cpp2
-rwxr-xr-xcpp/src/Ice/Service.cpp6
-rw-r--r--cpp/src/IcePack/IcePackNode.cpp2
-rw-r--r--cpp/src/IcePack/IcePackRegistry.cpp2
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"