ccanlint: prepend module headers before standard ones.
authorRusty Russell <rusty@rustcorp.com.au>
Tue, 1 Mar 2011 12:49:20 +0000 (23:19 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 1 Mar 2011 12:49:20 +0000 (23:19 +1030)
Especially since they probably define _GNU_SOURCE.

tools/ccanlint/tests/examples_compile.c

index 67412df34e184301cd3894e78080ab546cb8c480..a0a3dd64c57bf61bbde8d92ae24e140038c5f6e5 100644 (file)
@@ -314,23 +314,24 @@ static char *mangle(struct manifest *m, char **lines)
        bool in_function = false, fake_function = false, has_main = false;
        unsigned int i;
 
-       ret = talloc_strdup(m, "/* Prepend a heap of headers. */\n"
-                           "#include <assert.h>\n"
-                           "#include <err.h>\n"
-                           "#include <errno.h>\n"
-                           "#include <fcntl.h>\n"
-                           "#include <limits.h>\n"
-                           "#include <stdbool.h>\n"
-                           "#include <stdint.h>\n"
-                           "#include <stdio.h>\n"
-                           "#include <stdlib.h>\n"
-                           "#include <string.h>\n"
-                           "#include <sys/stat.h>\n"
-                           "#include <sys/types.h>\n"
-                           "#include <unistd.h>\n");
-       ret = talloc_asprintf_append(ret, "/* Include header from module. */\n"
-                                    "#include <ccan/%s/%s.h>\n",
-                                    m->basename, m->basename);
+       ret = talloc_asprintf(m, 
+                             "/* Include header from module. */\n"
+                             "#include <ccan/%s/%s.h>\n"
+                             "/* Prepend a heap of headers. */\n"
+                             "#include <assert.h>\n"
+                             "#include <err.h>\n"
+                             "#include <errno.h>\n"
+                             "#include <fcntl.h>\n"
+                             "#include <limits.h>\n"
+                             "#include <stdbool.h>\n"
+                             "#include <stdint.h>\n"
+                             "#include <stdio.h>\n"
+                             "#include <stdlib.h>\n"
+                             "#include <string.h>\n"
+                             "#include <sys/stat.h>\n"
+                             "#include <sys/types.h>\n"
+                             "#include <unistd.h>\n",
+                             m->basename, m->basename);
 
        ret = talloc_asprintf_append(ret, "/* Useful dummy functions. */\n"
                                     "extern int somefunc(void);\n"