diff options
Diffstat (limited to 'cpp/src/iceserviceinstall/ServiceInstaller.cpp')
-rw-r--r-- | cpp/src/iceserviceinstall/ServiceInstaller.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp index 2aeece3d32f..1b4e9aade6d 100644 --- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp +++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp @@ -8,10 +8,7 @@ // ********************************************************************** #define _WIN32_WINNT 0x0500 - -#if defined(_MSC_VER) && _MSC_VER >= 1400 -# define _CRT_SECURE_NO_DEPRECATE 1 // C4996 '<C function>' was declared deprecated -#endif +#define _CRT_SECURE_NO_DEPRECATE 1 // C4996 '<C function>' was declared deprecated #include <ServiceInstaller.h> #include <IceUtil/StringUtil.h> @@ -19,13 +16,7 @@ #include <Aclapi.h> - -#if defined(_MSC_VER) && _MSC_VER >= 1300 -// -// The VC6 headers don't include Sddl.h -// #include <Sddl.h> -#endif using namespace std; using namespace Ice; @@ -475,13 +466,10 @@ IceServiceInstaller::initializeSid(const string& name) if(_debug) { Trace trace(_communicator->getLogger(), "IceServiceInstaller"); - -#if defined(_MSC_VER) && _MSC_VER >= 1300 wchar_t* sidString = 0; ConvertSidToStringSidW(_sid.get(), &sidString); trace << "SID: " << IceUtil::wstringToString(sidString) << "; "; LocalFree(sidString); -#endif trace << "Full name: " << _sidName; } } |