opt/chromium/nss-3.15.diff

30 lines
931 B
Diff

Index: net/third_party/nss/ssl/bodge/secitem_array.c
diff --git a/net/third_party/nss/ssl/bodge/secitem_array.c b/net/third_party/nss/ssl/bodge/secitem_array.c
index ac80da8e4770106c4b50cc4e4c205c4183d2ad69..62e590742194012b49f17d72b0cdf383c135416a 100644
--- a/net/third_party/nss/ssl/bodge/secitem_array.c
+++ b/net/third_party/nss/ssl/bodge/secitem_array.c
@@ -6,6 +6,7 @@
* Support routines for SECItemArray data structure.
*/
+#include "nssutil.h"
#include "seccomon.h"
#include "secitem.h"
#include "secerr.h"
@@ -13,10 +14,15 @@
typedef struct SECItemArrayStr SECItemArray;
+#define NSSUTIL_VERSION_NUM \
+ (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH)
+#if NSSUTIL_VERSION_NUM < 31500
+// Added in NSS 3.15.
struct SECItemArrayStr {
SECItem *items;
unsigned int len;
};
+#endif
SECItemArray *
SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len)