tools: Make compileable on NetBSD

Make the tools compileable on NetBSD.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

diff --git a/src/swtpm/logging.c b/src/swtpm/logging.c
index b79c1597730d43bef40829d54fde5a0986f37ee6..070d6013d6453b686746aee4f1f45358ede4ea32 100644 (file)
--- a/src/swtpm/logging.c
+++ b/src/swtpm/logging.c
@@ -37,7 +37,7 @@
  
 #include "config.h"
 
-#if !defined __OpenBSD__ && !defined __FreeBSD__
+#if !defined __OpenBSD__ && !defined __FreeBSD__ && !defined __NetBSD__
  #define _GNU_SOURCE
  #include <features.h>
 #endif

diff --git a/src/swtpm/options.c b/src/swtpm/options.c
index 7da7019b448911c25fd913f46c9b52680cd823a2..82727016de9821caf866ccc2b271ee365930625c 100644 (file)
--- a/src/swtpm/options.c
+++ b/src/swtpm/options.c
@@ -37,7 +37,7 @@
 
 #include "config.h"
 
-#if !defined __OpenBSD__ && !defined __FreeBSD__
+#if !defined __OpenBSD__ && !defined __FreeBSD__ && !defined __NetBSD__
  #define _GNU_SOURCE
  #include <features.h>
 #endif

diff --git a/src/swtpm_bios/tpm_bios.c b/src/swtpm_bios/tpm_bios.c
index cd1f9fdbb24398ec2878c74a0bdc80a7e399d1d8..eb6d4adc8f3512382fccbaf014e8196527923f0d 100644 (file)
--- a/src/swtpm_bios/tpm_bios.c
+++ b/src/swtpm_bios/tpm_bios.c
@@ -46,7 +46,7 @@
 #include <stdlib.h>
 #include <netdb.h>
 #include <sys/un.h>
-#if defined __FreeBSD__
+#if defined __FreeBSD__ || defined __NetBSD__
 # include <sys/endian.h>
 # include <netinet/in.h>
 #else
@@ -695,8 +695,13 @@ int main(int argc, char *argv[])
        };
        int opt, option_index = 0;
 
+#ifdef __NetBSD__
+       while ((opt = getopt_long(argc, argv, "D:T:U:cdhvnsoCEu2", long_options,
+                               &option_index)) != -1) {
+#else
        while ((opt = getopt_long_only(argc, argv, "", long_options,
                                &option_index)) != -1) {
+#endif
                switch (opt) {
                case 'D':
                        tpm_device = strdup(optarg);

diff --git a/src/swtpm_ioctl/tpm_ioctl.c b/src/swtpm_ioctl/tpm_ioctl.c
index 302afdafabf66d2f6aef1fb49cc88b6a7e299dc7..1bad67e58b727363042b8a5747595d988a4c47cb 100644 (file)
--- a/src/swtpm_ioctl/tpm_ioctl.c
+++ b/src/swtpm_ioctl/tpm_ioctl.c
@@ -867,8 +867,13 @@ int main(int argc, char *argv[])
     char *endptr = NULL;
     int ret = EXIT_FAILURE;
 
+#if defined __NetBSD__
+    while ((opt = getopt_long(argc, argv, "D:T:U:citser:vCl:h:gb:S:L:VI:H",
+                              long_options, &option_index)) != -1) {
+#else
     while ((opt = getopt_long_only(argc, argv, "", long_options,
                                    &option_index)) != -1) {
+#endif
         switch (opt) {
         case 'D':
             tpm_device = optarg;