while $() is more modern than ``, it does not work with the

[mandoc.git] / test-getsubopt.c

diff --git a/test-getsubopt.c b/test-getsubopt.c
index b0835697e83cb17f912ff557b8938a26cc7b5fbc..9af1e09b58f6882ccfa957f219954beaf3bd8031 100644 (file)
--- a/test-getsubopt.c
+++ b/test-getsubopt.c
@@ -1,4 +1,4 @@
-/*     $Id: test-getsubopt.c,v 1.3 2014/08/17 20:53:50 schwarze Exp $  */
+/*     $Id: test-getsubopt.c,v 1.6 2018/08/15 14:37:41 schwarze Exp $  */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -15,12 +15,15 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(__linux__) || defined(__MINT__)
-#define _GNU_SOURCE /* getsubopt() */
-#endif
-
 #include <stdlib.h>
 
+/*
+ * NetBSD declared this function in the wrong header before August 2018.
+ * No harm is done by allowing that, too:
+ * The only file using it, main.c, also includes unistd.h, anyway.
+ */
+#include <unistd.h>
+
 int
 main(void)
 {
@@ -29,6 +32,6 @@ main(void)
        char token0[] = "k";
        char *const tokens[] = { token0, NULL };
        char *value = NULL;
-       return( ! (0 == getsubopt(&options, tokens, &value)
-           && value == buf+2 && options == buf+3));
+       return ! (getsubopt(&options, tokens, &value) == 0
+           && value == buf+2 && options == buf+3);
 }