Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bifcl: Add missing zeek/ to generated header includes

Browse source 
Related to https://github.com/zeek/zeek/pull/1377
This commit is contained in:
Jon Siwek 2021-01-29 19:14:58 -08:00 • committed by Tim Wojtulewicz
parent 279d5f3fad
commit 34c4f678cf
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tools/bifcl/builtin-func.l
View file

@ -235,14 +235,14 @@ void init_alternative_mode()
fprintf(fp_func_h, "#ifndef BRO_IN_NETVAR\n"); fprintf(fp_func_h, "#ifndef BRO_IN_NETVAR\n");
fprintf(fp_func_h, "#ifndef %s\n", guard); fprintf(fp_func_h, "#ifndef %s\n", guard);
fprintf(fp_func_h, "#define %s\n", guard); fprintf(fp_func_h, "#define %s\n", guard);
fprintf(fp_func_h, "#include \"zeek-bif.h\"\n"); fprintf(fp_func_h, "#include \"zeek/zeek-bif.h\"\n");
fprintf(fp_func_h, "#endif\n"); fprintf(fp_func_h, "#endif\n");
fprintf(fp_func_h, "#endif\n"); fprintf(fp_func_h, "#endif\n");
fprintf(fp_func_h, "\n"); fprintf(fp_func_h, "\n");
fprintf(fp_func_def, "\n"); fprintf(fp_func_def, "\n");
fprintf(fp_func_def, "#include \"%s.h\"\n", input_filename); fprintf(fp_func_def, "#include \"%s.h\"\n", input_filename);
fprintf(fp_func_def, "#include \"Func.h\"\n"); fprintf(fp_func_def, "#include \"zeek/Func.h\"\n");
fprintf(fp_func_def, "\n"); fprintf(fp_func_def, "\n");
static char name[1024]; static char name[1024];
@ -267,8 +267,8 @@ void init_alternative_mode()
fprintf(fp_func_init, "\n"); fprintf(fp_func_init, "\n");
fprintf(fp_func_init, "#include <list>\n"); fprintf(fp_func_init, "#include <list>\n");
fprintf(fp_func_init, "#include <string>\n"); fprintf(fp_func_init, "#include <string>\n");
fprintf(fp_func_init, "#include \"plugin/Plugin.h\"\n"); fprintf(fp_func_init, "#include \"zeek/plugin/Plugin.h\"\n");
fprintf(fp_func_init, "#include \"Func.h\"\n"); fprintf(fp_func_init, "#include \"zeek/Func.h\"\n");
fprintf(fp_func_init, "#include \"%s.h\"\n", input_filename); fprintf(fp_func_init, "#include \"%s.h\"\n", input_filename);
fprintf(fp_func_init, "\n"); fprintf(fp_func_init, "\n");
fprintf(fp_func_init, "namespace plugin { namespace %s {\n", plugin_canon); fprintf(fp_func_init, "namespace plugin { namespace %s {\n", plugin_canon);
@ -276,7 +276,7 @@ void init_alternative_mode()
fprintf(fp_func_init, "void __bif_%s_init(zeek::plugin::Plugin* plugin)\n", name); fprintf(fp_func_init, "void __bif_%s_init(zeek::plugin::Plugin* plugin)\n", name);
fprintf(fp_func_init, "\t{\n"); fprintf(fp_func_init, "\t{\n");
fprintf(fp_func_register, "#include \"plugin/Manager.h\"\n"); fprintf(fp_func_register, "#include \"zeek/plugin/Manager.h\"\n");
fprintf(fp_func_register, "\n"); fprintf(fp_func_register, "\n");
fprintf(fp_func_register, "namespace plugin { namespace %s {\n", plugin_canon); fprintf(fp_func_register, "namespace plugin { namespace %s {\n", plugin_canon);
fprintf(fp_func_register, "void __bif_%s_init(zeek::plugin::Plugin* plugin);\n", name); fprintf(fp_func_register, "void __bif_%s_init(zeek::plugin::Plugin* plugin);\n", name);