Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/util/secasn1t.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/. */
 
 /*
  * Types for encoding/decoding of ASN.1 using BER/DER (Basic/Distinguished
  * Encoding Rules).
  *
- * $Id: secasn1t.h,v 1.11 2012/04/25 14:50:16 gerv%gerv.net Exp $
+ * $Id: secasn1t.h,v 1.12 2013/01/08 16:19:09 kaie%kuix.de Exp $
  */
 
 #ifndef _SECASN1T_H_
 #define _SECASN1T_H_
 
 #include "utilrename.h"
 
 /*
 ** An array of these structures defines a BER/DER encoding for an object.
 **
@@ skipping 156 matching lines @@
 #define SEC_ASN1D_MAX_DEPTH 32
 
 /*
 ** Function used for SEC_ASN1_DYNAMIC.
 ** "arg" is a pointer to the structure being encoded/decoded
 ** "enc", when true, means that we are encoding (false means decoding)
 */
 typedef const SEC_ASN1Template * SEC_ASN1TemplateChooser(void *arg, PRBool enc);
 typedef SEC_ASN1TemplateChooser * SEC_ASN1TemplateChooserPtr;
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(ANDROID)
 #define SEC_ASN1_GET(x)        NSS_Get_##x(NULL, PR_FALSE)
 #define SEC_ASN1_SUB(x)        &p_NSS_Get_##x
 #define SEC_ASN1_XTRN          SEC_ASN1_DYNAMIC
 #define SEC_ASN1_MKSUB(x) \
 static const SEC_ASN1TemplateChooserPtr p_NSS_Get_##x = &NSS_Get_##x;
 #else
 #define SEC_ASN1_GET(x)        x
 #define SEC_ASN1_SUB(x)        x
 #define SEC_ASN1_XTRN          0
 #define SEC_ASN1_MKSUB(x) 
@@ skipping 64 matching lines @@
  * - "depth" is how deep in a nested encoding we are (it is not usually
  *   valuable, but can be useful sometimes so I included it)
  * - "data_kind" tells you if these bytes are part of the ASN.1 encoded
  *   octets for identifier, length, contents, or end-of-contents
  */ 
 typedef void (* SEC_ASN1WriteProc)(void *arg,
                                    const char *data, unsigned long len,
                                    int depth, SEC_ASN1EncodingPart data_kind);
 
 #endif /* _SECASN1T_H_ */