]> granicus.if.org Git - icinga2/commitdiff
Make GCC 4.6 happy
authorGunnar Beutner <gunnar.beutner@netways.de>
Sun, 28 Aug 2016 12:33:42 +0000 (14:33 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Sun, 28 Aug 2016 12:33:42 +0000 (14:33 +0200)
refs #12576

tools/mkembedconfig/mkembedconfig.c

index 0050bc7e771511991a63a1956c8a942fb8d49cb3..b595a6bcae8e38ef6d71fc9919399e61ad226ff2 100644 (file)
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
 
        fprintf(outfp, "/* This file has been automatically generated\n"
            "   from the input file \"%s\". */\n\n", argv[1]);
-       fprintf(outfp, "#include \"config/configfragment.hpp\"\n\nREGISTER_CONFIG_FRAGMENT(\"%s\", R\"CONFIG_FRAGMENT(\n", argv[1]);
+       fputs("#include \"config/configfragment.hpp\"\n\nnamespace {\n\nconst char *fragment = R\"CONFIG_FRAGMENT(", outfp);
 
        while (!feof(infp)) {
                char buf[1024];
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
                fwrite(buf, rc, 1, outfp);
        }
 
-       fputs(")CONFIG_FRAGMENT\");", outfp);
+       fprintf(outfp, ")CONFIG_FRAGMENT\";\n\nREGISTER_CONFIG_FRAGMENT(\"%s\", fragment);\n\n}", argv[1]);
 
        fclose(outfp);
        fclose(infp);