incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1354777 - in /incubator/ooo/symphony/trunk/main/xmlsecurity: ./ source/xmlsec/nss/nssrenam.h source/xmlsec/nss/securityenvironment_nssimpl.cxx source/xmlsec/nss/x509certificate_nssimpl.cxx
Date Thu, 28 Jun 2012 00:05:34 GMT
Author: pfg
Date: Thu Jun 28 00:05:32 2012
New Revision: 1354777

URL: http://svn.apache.org/viewvc?rev=1354777&view=rev
Log:
Merge r1190155 - Remove MPLd header nssrenam.h

Removed:
    incubator/ooo/symphony/trunk/main/xmlsecurity/source/xmlsec/nss/nssrenam.h
Modified:
    incubator/ooo/symphony/trunk/main/xmlsecurity/   (props changed)
    incubator/ooo/symphony/trunk/main/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
    incubator/ooo/symphony/trunk/main/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx

Propchange: incubator/ooo/symphony/trunk/main/xmlsecurity/
------------------------------------------------------------------------------
    svn:mergeinfo = /incubator/ooo/trunk/main/xmlsecurity:1190155

Modified: incubator/ooo/symphony/trunk/main/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/symphony/trunk/main/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx?rev=1354777&r1=1354776&r2=1354777&view=diff
==============================================================================
--- incubator/ooo/symphony/trunk/main/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
(original)
+++ incubator/ooo/symphony/trunk/main/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
Thu Jun 28 00:05:32 2012
@@ -33,7 +33,10 @@
 #include "precompiled_xmlsecurity.hxx"
 
 //todo before commit:  nssrenam.h is not delivered!!!
-#include "nssrenam.h"
+#ifndef __nssrenam_h_
+#define CERT_NewTempCertificate __CERT_NewTempCertificate
+#endif /* __nssrenam_h_ */
+
 #include "cert.h"
 #include "secerr.h"
 

Modified: incubator/ooo/symphony/trunk/main/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/symphony/trunk/main/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx?rev=1354777&r1=1354776&r2=1354777&view=diff
==============================================================================
--- incubator/ooo/symphony/trunk/main/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
(original)
+++ incubator/ooo/symphony/trunk/main/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
Thu Jun 28 00:05:32 2012
@@ -32,8 +32,10 @@
 #include "precompiled_xmlsecurity.hxx"
 
 
+#ifndef __nssrenam_h_
+#define CERT_DecodeDERCertificate __CERT_DecodeDERCertificate
+#endif  /* __nssrenam_h_ */
 
-#include "nssrenam.h"
 #include "nspr.h"
 #include "nss.h"
 #include "secder.h"



Mime
View raw message