[src/trunk]: src/crypto/external/cpl/trousers/dist/src add && defined(__NetBS...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/860f62df1b3d
branches:  trunk
changeset: 773098:860f62df1b3d
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 28 02:05:55 2012 +0000

description:
add && defined(__NetBSD__) where appropriate

diffstat:

 crypto/external/cpl/trousers/dist/src/include/linux/tpm.h      |  2 +-
 crypto/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(-)

diffs (66 lines):

diff -r 2781c1c3bcce -r 860f62df1b3d crypto/external/cpl/trousers/dist/src/include/linux/tpm.h
--- a/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h Sat Jan 28 02:03:41 2012 +0000
+++ b/crypto/external/cpl/trousers/dist/src/include/linux/tpm.h Sat Jan 28 02:05:55 2012 +0000
@@ -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 -r 2781c1c3bcce -r 860f62df1b3d crypto/external/cpl/trousers/dist/src/include/trousers_types.h
--- a/crypto/external/cpl/trousers/dist/src/include/trousers_types.h    Sat Jan 28 02:03:41 2012 +0000
+++ b/crypto/external/cpl/trousers/dist/src/include/trousers_types.h    Sat Jan 28 02:05:55 2012 +0000
@@ -120,7 +120,7 @@
 
 #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 -r 2781c1c3bcce -r 860f62df1b3d crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c
--- a/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c Sat Jan 28 02:03:41 2012 +0000
+++ b/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c Sat Jan 28 02:05:55 2012 +0000
@@ -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 -r 2781c1c3bcce -r 860f62df1b3d crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c
--- a/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c    Sat Jan 28 02:03:41 2012 +0000
+++ b/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c    Sat Jan 28 02:05:55 2012 +0000
@@ -193,7 +193,7 @@
        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 @@
                        comma = rindex(arg, ',');
 
                        if (comma == NULL) {
-                               if (!isdigit(*arg))
+                               if (!isdigit((unsigned char)*arg))
                                        break;
 
                                comma = arg;
@@ -339,7 +339,7 @@
                        comma = rindex(arg, ',');
 
                        if (comma == NULL) {
-                               if (!isdigit(*arg))
+                               if (!isdigit((unsigned char)*arg))
                                        break;
 
                                comma = arg;