diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-15 14:03:01 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-16 21:20:08 +0100 |
| commit | f958657cc5a179a2bccff06f88cd36f80b779184 (patch) | |
| tree | e5d9eda71d9a2add0c1576ca36a1d5d2b778446a /xmlsecurity | |
| parent | bacafe9a07cb2af737b99641efc9cddf55340837 (diff) | |
gcc-trunk: fix error: unable to find string literal operator 'operator"" FOO'
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 728ed766e111..b5e4a13d8c33 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -300,7 +300,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa #if defined SYSTEM_MOZILLA OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION)); #else - OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${LO_LIB_DIR}/libnssckbi"SAL_DLLEXTENSION)); + OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION)); #endif ::rtl::Bootstrap::expandMacros(rootModule); @@ -330,18 +330,18 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa RootsModule = 0; if (found) xmlsec_trace("Added new root certificate module " - "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr()); + "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr()); else { xmlsec_trace("FAILED to load the new root certificate module " - "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr()); + "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr()); return_value = false; } } else { xmlsec_trace("FAILED to add new root certifice module: " - "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr()); + "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr()); return_value = false; } @@ -370,17 +370,17 @@ extern "C" void nsscrypto_finalize() if (SECSuccess == SECMOD_UnloadUserModule(RootsModule)) { - xmlsec_trace("Unloaded module \""ROOT_CERTS"\"."); + xmlsec_trace("Unloaded module \"" ROOT_CERTS "\"."); } else { - xmlsec_trace("Failed unloading module \""ROOT_CERTS"\"."); + xmlsec_trace("Failed unloading module \"" ROOT_CERTS "\"."); } SECMOD_DestroyModule(RootsModule); } else { - xmlsec_trace("Unloading module \""ROOT_CERTS + xmlsec_trace("Unloading module \"" ROOT_CERTS "\" failed because it was not found."); } PK11_LogoutAll(); |