diff options
| author | newhook <matthew.newhook@gmail.com> | 2015-04-22 16:17:04 -0230 |
|---|---|---|
| committer | newhook <matthew.newhook@gmail.com> | 2015-04-22 16:17:04 -0230 |
| commit | e95d34aa245abb5c7dba23a2da0d17c90e90f706 (patch) | |
| tree | 8e56352ab7b319f883e633622a6802d4a3e23eec /cpp | |
| parent | ICE-6457 (diff) | |
| download | ice-e95d34aa245abb5c7dba23a2da0d17c90e90f706.tar.bz2 ice-e95d34aa245abb5c7dba23a2da0d17c90e90f706.tar.xz ice-e95d34aa245abb5c7dba23a2da0d17c90e90f706.zip | |
ICE-6455 - remove slice2py and slice2rb C++ exe
Fix slice2rb.rb and slice2py.py scripts for Windows.
Fix build issue with IceSSL and MinGW.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules | 8 | ||||
| -rw-r--r-- | cpp/config/Make.rules.MINGW | 8 | ||||
| -rw-r--r-- | cpp/src/IceSSL/Util.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index cdd3315faf8..01dfdeaf94c 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -134,14 +134,6 @@ USE_READLINE ?= no #GENPIC ?= yes # -# If building with MinGW and third party libraries are not installed -# in the default location and THIRDPARTY_HOME is not set in your -# environment variables, change the following setting to reflect the -# installation location. -# -#THIRDPARTY_HOME ?= C:\Program Files (x86)\ZeroC\Ice-$(VERSION)-ThirdParty - -# # Default Mutex protocol: one of PrioNone or PrioInherit. # #DEFAULT_MUTEX_PROTOCOL ?= PrioNone diff --git a/cpp/config/Make.rules.MINGW b/cpp/config/Make.rules.MINGW index 0fe6af9f45c..02b11feecd6 100644 --- a/cpp/config/Make.rules.MINGW +++ b/cpp/config/Make.rules.MINGW @@ -8,6 +8,14 @@ # ********************************************************************** # +# If building with MinGW and third party libraries are not installed +# in the default location and THIRDPARTY_HOME is not set in your +# environment variables, change the following setting to reflect the +# installation location. +# +THIRDPARTY_HOME ?= C:\Program Files (x86)\ZeroC\Ice-$(VERSION)-ThirdParty + +# # This file is included by Make.rules when building with MinGW. # diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index 06ee07cfece..2e3287c1c35 100644 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -1116,7 +1116,7 @@ IceSSL::findCertificates(const string& prop, const string& storeSpec, const stri CERT_OID_NAME_STR | CERT_NAME_STR_FORCE_UTF8_DIR_STR_FLAG, CERT_OID_NAME_STR | CERT_NAME_STR_FORCE_UTF8_DIR_STR_FLAG | CERT_NAME_STR_REVERSE_FLAG }; - for(int i = 0; i < sizeof(flags) / sizeof(DWORD); ++i) + for(size_t i = 0; i < sizeof(flags) / sizeof(DWORD); ++i) { DWORD length = 0; if(!CertStrToNameW(X509_ASN_ENCODING, argW.c_str(), flags[i], 0, 0, &length, 0)) |