From 6a35549fad5b2fd1c761e207ab425b8626ee6251 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sat, 28 Jan 2012 02:05:55 +0000
Subject: [PATCH] add && defined(__NetBSD__) where appropriate

---
 crypto/external/cpl/trousers/dist/src/include/linux/tpm.h   | 2 +-
 .../external/cpl/trousers/dist/src/include/trousers_types.h | 2 +-
 crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c   | 2 +-
 crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c      | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h b/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h
index ee32c4db6903..95fd570bbfa9 100644
--- a/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h
+++ b/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h
@@ -18,7 +18,7 @@
 
 #if (defined (__linux) || defined (linux))
 #include <linux/ioctl.h>
-#elif (defined (__OpenBSD__) || defined (__FreeBSD__))
+#elif (defined (__OpenBSD__) || defined (__FreeBSD__) || defined(__NetBSD__))
 #include <sys/ioctl.h>
 #endif
 
diff --git a/crypto/external/cpl/trousers/dist/src/include/trousers_types.h b/crypto/external/cpl/trousers/dist/src/include/trousers_types.h
index 1c1d79fe98df..8774ffda6a95 100644
--- a/crypto/external/cpl/trousers/dist/src/include/trousers_types.h
+++ b/crypto/external/cpl/trousers/dist/src/include/trousers_types.h
@@ -120,7 +120,7 @@ typedef struct tdTSS_KEY {
 
 #if (defined (__linux) || defined (linux) || defined (SOLARIS) || defined (__GLIBC__))
 #define BSD_CONST
-#elif (defined (__OpenBSD__) || defined (__FreeBSD__))
+#elif (defined (__OpenBSD__) || defined (__FreeBSD__) || defined(__NetBSD__))
 #define BSD_CONST const
 #endif
 
diff --git a/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c b/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c
index ca1a4df62ade..c68ca6e10525 100644
--- a/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c
+++ b/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c
@@ -13,7 +13,7 @@
 #include <syslog.h>
 #include <string.h>
 #include <netdb.h>
-#if (defined (__OpenBSD__) || defined (__FreeBSD__))
+#if (defined (__OpenBSD__) || defined (__FreeBSD__) || defined(__NetBSD__))
 #include <sys/types.h>
 #include <sys/socket.h>
 #endif
diff --git a/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c b/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c
index afc1dcb8577f..d6ae150b8fce 100644
--- a/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c
+++ b/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c
@@ -193,7 +193,7 @@ get_file_path(char *ptr, char **dest)
 	char tmp_buf[1024];
 	int i = 0;
 
-	while (isalpha(*ptr) || isdigit(*ptr) ||
+	while (isalpha((unsigned char)*ptr) || isdigit((unsigned char)*ptr) ||
 		*ptr == '/' || *ptr == '.' || *ptr == '#' || *ptr == '_' || *ptr == '-')
 	{
 		tmp_buf[i] = *ptr;
@@ -310,7 +310,7 @@ read_conf_line(char *buf, int line_num, struct tcsd_config *conf)
 			comma = rindex(arg, ',');
 
 			if (comma == NULL) {
-				if (!isdigit(*arg))
+				if (!isdigit((unsigned char)*arg))
 					break;
 
 				comma = arg;
@@ -339,7 +339,7 @@ read_conf_line(char *buf, int line_num, struct tcsd_config *conf)
 			comma = rindex(arg, ',');
 
 			if (comma == NULL) {
-				if (!isdigit(*arg))
+				if (!isdigit((unsigned char)*arg))
 					break;
 
 				comma = arg;