Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/certhigh/ocspi.h

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * ocspi.h - NSS internal interfaces to OCSP code
  *
- * $Id: ocspi.h,v 1.12 2012/04/25 14:49:27 gerv%gerv.net Exp $
+ * $Id: ocspi.h,v 1.13 2012/12/12 19:29:40 wtc%google.com Exp $
  */
 
 #ifndef _OCSPI_H_
 #define _OCSPI_H_
 
 SECStatus OCSP_InitGlobal(void);
 SECStatus OCSP_ShutdownGlobal(void);
 
 ocspResponseData *
 ocsp_GetResponseData(CERTOCSPResponse *response, SECItem **tbsResponseDataDER);
@@ skipping 110 matching lines @@
                           PRBool *isDefault);
 
 /* FUNCTION: ocsp_FetchingFailureIsVerificationFailure
  * The function checks the global ocsp settings and
  * tells how to treat an ocsp response fetching failure.
  * RETURNS:
  *   if PR_TRUE is returned, then treat fetching as a
  *   revoked cert status.
  */
 PRBool
-ocsp_FetchingFailureIsVerificationFailure();
+ocsp_FetchingFailureIsVerificationFailure(void);
 
 #endif /* _OCSPI_H_ */