diff -wpruN '--exclude=*.orig' a~/nss/lib/softoken/pkcs11.c a/nss/lib/softoken/pkcs11.c
--- a~/nss/lib/softoken/pkcs11.c	1970-01-01 00:00:00
+++ a/nss/lib/softoken/pkcs11.c	1970-01-01 00:00:00
@@ -3377,8 +3377,8 @@ nsc_CommonInitialize(CK_VOID_PTR pReserv
         char buf[200];
         int major = 0, minor = 0;
 
-        long rv = sysinfo(SI_RELEASE, buf, sizeof(buf));
-        if (rv > 0 && rv < sizeof(buf)) {
+        long rvtmp = sysinfo(SI_RELEASE, buf, sizeof(buf));
+        if (rvtmp > 0 && rvtmp < sizeof(buf)) {
             if (2 == sscanf(buf, "%d.%d", &major, &minor)) {
                 /* Are we on Solaris 10 or greater ? */
                 if (major > 5 || (5 == major && minor >= 10)) {