prefix Der_class with ASN1_C_ to avoid problems with system headerfiles that pollute the name space

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15255 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-05-29 14:23:01 +00:00
parent 084b3b2d2a
commit 8e78ed6e48
6 changed files with 35 additions and 30 deletions

View File

@@ -88,7 +88,7 @@ decode_type (const char *name, const Type *t)
int pos;
fprintf (codefile,
"e = der_match_tag_and_length (p, len, UNIV, PRIM, UT_BitString,"
"e = der_match_tag_and_length (p, len, ASN1_C_UNIV, PRIM, UT_BitString,"
"&reallen, &l);\n"
"FORW;\n"
"if(len < reallen)\n"
@@ -122,7 +122,7 @@ decode_type (const char *name, const Type *t)
break;
fprintf (codefile,
"e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
"e = der_match_tag_and_length (p, len, ASN1_C_UNIV, CONS, UT_Sequence,"
"&reallen, &l);\n"
"FORW;\n"
"{\n"
@@ -159,7 +159,7 @@ decode_type (const char *name, const Type *t)
}else{
fprintf (codefile, "{\n"
"size_t newlen, oldlen;\n\n"
"e = der_match_tag (p, len, CONTEXT, CONS, %d, &l);\n",
"e = der_match_tag (p, len, ASN1_C_CONTEXT, CONS, %d, &l);\n",
m->val);
fprintf (codefile,
"if (e)\n");
@@ -219,7 +219,7 @@ decode_type (const char *name, const Type *t)
char *n;
fprintf (codefile,
"e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
"e = der_match_tag_and_length (p, len, ASN1_C_UNIV, CONS, UT_Sequence,"
"&reallen, &l);\n"
"FORW;\n"
"if(len < reallen)\n"
@@ -263,7 +263,7 @@ decode_type (const char *name, const Type *t)
break;
case TApplication:
fprintf (codefile,
"e = der_match_tag_and_length (p, len, APPL, CONS, %d, "
"e = der_match_tag_and_length (p, len, ASN1_C_APPL, CONS, %d, "
"&reallen, &l);\n"
"FORW;\n"
"{\n"
@@ -370,7 +370,7 @@ generate_seq_type_decode (const Symbol *s)
"int dce_fix;\n");
fprintf (codefile,
"e = der_match_tag(p, len, CONTEXT, CONS, tag, &l);\n"
"e = der_match_tag(p, len, ASN1_C_CONTEXT, CONS, tag, &l);\n"
"if (e)\n"
"return e;\n");
fprintf (codefile,