Merge branch 'master' of ozlabs.org:ccan

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 812b1b0316ff22632f71d9fde074e19183cfdf8b..14c40934ce3c9e073c43467005323ccab7a4a1aa 100644 (file)
--- 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"
@@ -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,