Chromium Code Reviews| Index: mozilla/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c |
| =================================================================== |
| --- mozilla/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c (revision 182578) |
| +++ mozilla/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c (working copy) |
| @@ -201,8 +201,10 @@ |
| typedef SECStatus (*pkix_DecodeCertsFunc)(char *certbuf, int certlen, |
| CERTImportCertificateFunc f, void *arg); |
| +#ifdef NSS_STATIC |
| +extern SECStatus CERT_DecodeCertPackage(char*, int, CERTImportCertificateFunc, void*); |
|
wtc
2013/03/01 00:29:47
This seems to be longer than 80 chars. I would inc
|
| +#endif |
| - |
| struct pkix_DecodeFuncStr { |
| pkix_DecodeCertsFunc func; /* function pointer to the |
| * CERT_DecodeCertPackage function */ |
| @@ -223,6 +225,10 @@ |
| */ |
| static PRStatus PR_CALLBACK pkix_getDecodeFunction(void) |
| { |
| +#ifdef NSS_STATIC |
| + pkix_decodeFunc.func = &CERT_DecodeCertPackage; |
|
wtc
2013/03/01 00:29:47
The & is not necessary in C89 and later.
|
| + return PR_SUCCESS; |
| +#else |
| pkix_decodeFunc.smimeLib = |
| PR_LoadLibrary(SHLIB_PREFIX"smime3."SHLIB_SUFFIX); |
| if (pkix_decodeFunc.smimeLib == NULL) { |
| @@ -235,7 +241,7 @@ |
| return PR_FAILURE; |
| } |
| return PR_SUCCESS; |
| - |
| +#endif |
| } |
| /* |