X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=837ef8ce00ee9302605682bb27748287a369a4da;hb=298dc1222201440ccfbf39f59a68b37aa910ff0c;hp=b150dadb56d99f9e21bb4702b1f9af0e3e943bb6;hpb=62bbea8e5feea7b716c7bc8b41444080a24abc95;p=ccan

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index b150dadb..837ef8ce 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -38,6 +38,14 @@ struct test {
 static struct test tests[] = {
 	{ "HAVE_ALIGNOF", INSIDE_MAIN, NULL,
 	  "return __alignof__(double) > 0 ? 0 : 1;" },
+	{ "HAVE_ASPRINTF", DEFINES_FUNC, NULL,
+	  "#define _GNU_SOURCE\n"
+	  "#include <stdio.h>\n"
+	  "static char *func(int x) {"
+	  "	char *p;\n"
+	  "	if (asprintf(&p, \"%u\", x) == -1) p = NULL;"
+	  "	return p;\n"
+	  "}" },
 	{ "HAVE_ATTRIBUTE_COLD", DEFINES_FUNC, NULL,
 	  "static int __attribute__((cold)) func(int x) { return x; }" },
 	{ "HAVE_ATTRIBUTE_CONST", DEFINES_FUNC, NULL,
@@ -103,12 +111,12 @@ static struct test tests[] = {
 	  "	return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\n"
 	  "}" },
 	{ "HAVE_NESTED_FUNCTIONS", DEFINES_FUNC, NULL,
-	  "static int func(int val) {\n"
+	  "void (*func(int val))(int);\n"
+	  "void (*func(int val))(int) {\n"
 	  "	auto void add(int val2);\n"
 	  "	void add(int val2) { val += val2; }\n"
-	  "	add(7);\n"
-	  "	return val;\n"
-	  "}" },
+	  "	return add;\n"
+	  "}\n" },
 	{ "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL,
 	  "return ({ int x = argc; x == argc ? 0 : 1; });" },
 	{ "HAVE_TYPEOF", INSIDE_MAIN, NULL,
@@ -337,9 +345,10 @@ int main(int argc, char *argv[])
 	unlink(INPUT_FILE);
 
 	cmd[strlen(cmd) - strlen(" -o " OUTPUT_FILE " " INPUT_FILE)] = '\0';
-	printf("#ifndef CCAN_CONFIG_H\n"
-	       "#define CCAN_CONFIG_H\n"
-	       "/* Generated by CCAN configurator */\n");
+	printf("/* Generated by CCAN configurator */\n"
+	       "#ifndef CCAN_CONFIG_H\n"
+	       "#define CCAN_CONFIG_H\n");
+	printf("#define _GNU_SOURCE /* Always use GNU extensions. */\n");
 	printf("#define CCAN_COMPILER \"%s\"\n", argv[1]);
 	printf("#define CCAN_CFLAGS \"%s\"\n\n", cmd + strlen(argv[1]) + 1);
 	for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)