X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=d46a147ada14e3c8b16f53bb354be47a4491d229;hp=b316c786d03bb86e7156c803219e58e3d1c5af9b;hb=08c05da588018c6b76834e57b66d525546643708;hpb=4c00ae05fa9ccac14883c44de158620e301ff8e6

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index b316c786..d46a147a 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -1,5 +1,26 @@
 /* Simple tool to create config.h.
- * Would be much easier with ccan modules, but deliberately standalone. */
+ * Would be much easier with ccan modules, but deliberately standalone.
+ *
+ * Copyright 2011 Rusty Russell <rusty@rustcorp.com.au>.  MIT license.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -38,6 +59,11 @@ struct test {
 };
 
 static struct test tests[] = {
+	{ "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE, NULL,
+	  "#include <sys/types.h>\n"
+	  "int main(int argc, char *argv[]) {\n"
+	  "	return sizeof(off_t) == 4 ? 0 : 1;\n"
+	  "}\n" },
 	{ "HAVE_ALIGNOF", INSIDE_MAIN, NULL,
 	  "return __alignof__(double) > 0 ? 0 : 1;" },
 	{ "HAVE_ASPRINTF", DEFINES_FUNC, NULL,
@@ -95,6 +121,13 @@ static struct test tests[] = {
 	{ "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL,
 	  "int *foo = (int[]) { 1, 2, 3, 4 };\n"
 	  "return foo[0] ? 0 : 1;" },
+	{ "HAVE_FILE_OFFSET_BITS", DEFINES_EVERYTHING|EXECUTE,
+	  "HAVE_32BIT_OFF_T",
+	  "#define _FILE_OFFSET_BITS 64\n"
+	  "#include <sys/types.h>\n"
+	  "int main(int argc, char *argv[]) {\n"
+	  "	return sizeof(off_t) == 8 ? 0 : 1;\n"
+	  "}\n" },
 	{ "HAVE_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL,
 	  "for (int i = 0; i < argc; i++) { return 0; };\n"
 	  "return 1;" },
@@ -104,6 +137,7 @@ static struct test tests[] = {
 	  "#include <unistd.h>\n"
 	  "static int func(void) { return getpagesize(); }" },
 	{ "HAVE_ISBLANK", DEFINES_FUNC, NULL,
+	  "#define _GNU_SOURCE\n"
 	  "#include <ctype.h>\n"
 	  "static int func(void) { return isblank(' '); }" },
 	{ "HAVE_LITTLE_ENDIAN", INSIDE_MAIN|EXECUTE, NULL,
@@ -134,13 +168,6 @@ static struct test tests[] = {
 	  " qsort_r(array, 3, sizeof(int), cmp, &called);\n"
 	  " return called && array[0] == 2 && array[1] == 5 && array[2] == 9 ? 0 : 1;\n"
 	  "}\n" },
-	{ "HAVE_NESTED_FUNCTIONS", DEFINES_FUNC, NULL,
-	  "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"
-	  "	return add;\n"
-	  "}\n" },
 	{ "HAVE_STACK_GROWS_UPWARDS", DEFINES_EVERYTHING|EXECUTE, NULL,
 	  "static long nest(const void *base, unsigned int i)\n"
 	  "{\n"
@@ -388,7 +415,9 @@ int main(int argc, const char *argv[])
 	printf("/* Generated by CCAN configurator */\n"
 	       "#ifndef CCAN_CONFIG_H\n"
 	       "#define CCAN_CONFIG_H\n");
+	printf("#ifndef _GNU_SOURCE\n");
 	printf("#define _GNU_SOURCE /* Always use GNU extensions. */\n");
+	printf("#endif\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++)