[nss] Synch. up with upstream patch, fixes a missing space.

Elio Maldonado emaldonado at fedoraproject.org
Fri Feb 11 16:51:02 UTC 2011


commit 4847c439c7e41f9a1777eb75dde29a142b4bc60d
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Feb 11 08:49:38 2011 -0800

    Synch. up with upstream patch, fixes a missing space.

 dont-use-cpp-reserved-words.patch |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/dont-use-cpp-reserved-words.patch b/dont-use-cpp-reserved-words.patch
index a27eb6c..8a8939e 100644
--- a/dont-use-cpp-reserved-words.patch
+++ b/dont-use-cpp-reserved-words.patch
@@ -445,8 +445,12 @@ diff -up ./mozilla/security/nss/lib/smime/cmsudf.c.676036 ./mozilla/security/nss
  			NSSCMSGenericWrapperDataDestroy destroy,
  			NSSCMSGenericWrapperDataCallback decode_before,
  			NSSCMSGenericWrapperDataCallback decode_after,
-@@ -465,7 +465,7 @@ NSS_CMSType_RegisterContentType(SECOidTa
-     typeInfo->type =type;
+@@ -462,10 +462,10 @@ NSS_CMSType_RegisterContentType(SECOidTa
+ 	return SECSuccess;
+     }
+     typeInfo = PORT_ArenaNew(nsscmstypeArena, nsscmstypeInfo);
+-    typeInfo->type =type;
++    typeInfo->type = type;
      typeInfo->size = size;
      typeInfo->isData = isData;
 -    typeInfo->template = template;


More information about the scm-commits mailing list