summaryrefslogtreecommitdiff
blob: 2a641478e12909ac28b0e65964d6b076bf01ceed (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
--- 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 @@
 
+#define NSSUTIL_VERSION_NUM \
+    (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH)
+#if NSSUTIL_VERSION_NUM < 31500
+// Added in NSS 3.15.
 typedef struct SECItemArrayStr SECItemArray;
 
 struct SECItemArrayStr {
     SECItem *items;
     unsigned int len;
 };
+#endif
 
 SECItemArray *
 SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len)