Update NSS to NSS_3_16_RC0.

nss/lib/softoken/lowkeyi.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/. */
 
 #ifndef _LOWKEYI_H_
 #define _LOWKEYI_H_
 
 #include "prtypes.h"
 #include "seccomon.h"
 #include "secoidt.h"
 #include "lowkeyti.h"
 
 SEC_BEGIN_PROTOS
 
 /*
  * See bugzilla bug 125359
  * Since NSS (via PKCS#11) wants to handle big integers as unsigned ints,
  * all of the templates above that en/decode into integers must be converted
  * from ASN.1's signed integer type.  This is done by marking either the
  * source or destination (encoding or decoding, respectively) type as
  * siUnsignedInteger.
  */
 extern void prepare_low_rsa_priv_key_for_asn1(NSSLOWKEYPrivateKey *key);
 extern void prepare_low_pqg_params_for_asn1(PQGParams *params);
 extern void prepare_low_dsa_priv_key_for_asn1(NSSLOWKEYPrivateKey *key);
 extern void prepare_low_dsa_priv_key_export_for_asn1(NSSLOWKEYPrivateKey *key);
 extern void prepare_low_dh_priv_key_for_asn1(NSSLOWKEYPrivateKey *key);
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
 extern void prepare_low_ec_priv_key_for_asn1(NSSLOWKEYPrivateKey *key);
 extern void prepare_low_ecparams_for_asn1(ECParams *params);
-#endif /* NSS_ENABLE_ECC */
+#endif /* NSS_DISABLE_ECC */
 
 /*
 ** Destroy a private key object.
 **      "key" the object
 **      "freeit" if PR_TRUE then free the object as well as its sub-objects
 */
 extern void nsslowkey_DestroyPrivateKey(NSSLOWKEYPrivateKey *key);
 
 /*
 ** Destroy a public key object.
@@ skipping 23 matching lines @@
 /* Make a copy of a low private key in it's own arena.
  * a return of NULL indicates an error.
  */
 extern NSSLOWKEYPrivateKey *
 nsslowkey_CopyPrivateKey(NSSLOWKEYPrivateKey *privKey);
 
 
 SEC_END_PROTOS
 
 #endif /* _LOWKEYI_H_ */