X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=14c40934ce3c9e073c43467005323ccab7a4a1aa;hp=d5a23c2a8503ec39ffd38e842ec45baaf5a51637;hb=9f5e1ef758d5b052a8df115f1d79c0c53e802ddf;hpb=98b8ada203137a324f1712c042f7f6f3a5ef9ea0

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index d5a23c2a..14c40934 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -127,6 +127,18 @@ static struct test tests[] = {
 	{ "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL,
 	  "int *foo = (int[]) { 1, 2, 3, 4 };\n"
 	  "return foo[0] ? 0 : 1;" },
+	{ "HAVE_ERR_H", DEFINES_FUNC, NULL,
+	  "#include <err.h>\n"
+	  "static void func(int arg) {\n"
+	  "	if (arg == 0)\n"
+	  "		err(1, \"err %u\", arg);\n"
+	  "	if (arg == 1)\n"
+	  "		errx(1, \"err %u\", arg);\n"
+	  "	if (arg == 3)\n"
+	  "		warn(\"warn %u\", arg);\n"
+	  "	if (arg == 4)\n"
+	  "		warnx(\"warn %u\", arg);\n"
+	  "}\n" },
 	{ "HAVE_FILE_OFFSET_BITS", DEFINES_EVERYTHING|EXECUTE,
 	  "HAVE_32BIT_OFF_T",
 	  "#define _FILE_OFFSET_BITS 64\n"
@@ -164,7 +176,7 @@ static struct test tests[] = {
 	{ "HAVE_PROC_SELF_MAPS", DEFINES_EVERYTHING|EXECUTE, NULL,
 	  "#include <sys/types.h>\n"
 	  "#include <sys/stat.h>\n"
-	  "#include <sys/fcntl.h>\n"
+	  "#include <fcntl.h>\n"
 	  "int main(void) {\n"
 	  "	return open(\"/proc/self/maps\", O_RDONLY) != -1 ? 0 : 1;\n"
 	  "}\n" },
@@ -200,6 +212,8 @@ static struct test tests[] = {
 	  "}\n" },
 	{ "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL,
 	  "return ({ int x = argc; x == argc ? 0 : 1; });" },
+	{ "HAVE_SYS_FILIO_H", OUTSIDE_MAIN, NULL, /* Solaris needs this for FIONREAD */
+	  "#include <sys/filio.h>\n" },
 	{ "HAVE_TYPEOF", INSIDE_MAIN, NULL,
 	  "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" },
 	{ "HAVE_UTIME", DEFINES_FUNC, NULL,