oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Revert "asn1: use roken for generated source files"

Browse Source 
This reverts commit e27e056b45.

e27e056b45 was needed mainly for ENOTSUP.
ENOTSUP is not available in older C run-times.

Also, lib/roken has wrappers for the CRT allocator, but we don't need
those in lib/asn1 because all the functions generated by the compiler
effectively encapsulate the corresponding DLL's CRT's allocator.

This will be followed by a change to not use ENOTSUP.
This commit is contained in:
Nicolas Williams
2021-11-23 17:59:17 -06:00
parent 6cfbde4d86
commit 92e5a4b7e5
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/asn1/gen.c
View File

@@ -177,9 +177,9 @@ init_generate (const char *filename, const char *base)
"#ifndef __%s_h__\n" "#ifndef __%s_h__\n"
"#define __%s_h__\n\n", headerbase, headerbase); "#define __%s_h__\n\n", headerbase, headerbase);
fprintf (headerfile, fprintf (headerfile,
"#include <config.h>\n" "#include <stddef.h>\n"
"#include <roken.h>\n" "#include <stdint.h>\n"
"#include <stddef.h>\n"); "#include <time.h>\n\n");
fprintf (headerfile, fprintf (headerfile,
"#ifndef __asn1_common_definitions__\n" "#ifndef __asn1_common_definitions__\n"
"#define __asn1_common_definitions__\n\n"); "#define __asn1_common_definitions__\n\n");
@@ -307,8 +307,12 @@ init_generate (const char *filename, const char *base)
fprintf (templatefile, fprintf (templatefile,
"/* Generated from %s */\n" "/* Generated from %s */\n"
"/* Do not edit */\n\n" "/* Do not edit */\n\n"
"#include <config.h>\n" "#include <stdio.h>\n"
"#include <roken.h>\n" "#include <stdlib.h>\n"
"#include <time.h>\n"
"#include <string.h>\n"
"#include <errno.h>\n"
"#include <limits.h>\n"
"#include <asn1_err.h>\n" "#include <asn1_err.h>\n"
"#include <%s>\n", "#include <%s>\n",
filename, filename,
@@ -407,8 +411,12 @@ generate_header_of_codefile(const char *name)
"/* Generated from %s */\n" "/* Generated from %s */\n"
"/* Do not edit */\n\n" "/* Do not edit */\n\n"
"#define ASN1_LIB\n\n" "#define ASN1_LIB\n\n"
"#include <config.h>\n" "#include <stdio.h>\n"
"#include <roken.h>\n" "#include <stdlib.h>\n"
"#include <time.h>\n"
"#include <string.h>\n"
"#include <errno.h>\n"
"#include <limits.h>\n"
"#include <%s>\n", "#include <%s>\n",
orig_filename, orig_filename,
type_file_string); type_file_string);