Fix for bug 433791. Delete Win16 references. r=nelson

sailfishos-mirror · Apr 7, 2009 · dcd4d29 · dcd4d29
1 parent eff13a6
commit dcd4d29
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 47 deletions.
diff --git a/security/nss/cmd/modutil/pk11jar.html b/security/nss/cmd/modutil/pk11jar.html
@@ -193,7 +193,6 @@ <h3>Global Keys</h3>
 <li>SONY (mips)
 <li>SUNOS (sparc)
 <li>UnixWare (x86)
-<li>WIN16 (x86)
 <li>WIN95 (x86)
 <li>WINNT (x86)
 </ul>

diff --git a/security/nss/lib/base/nssbaset.h b/security/nss/lib/base/nssbaset.h
@@ -56,8 +56,7 @@ static const char NSSBASET_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
  * NSS has its own versions of these NSPR macros, in a form which
  * does not confuse ctags and other related utilities.  NSPR 
  * defines these macros to take the type as an argument, because
- * of a requirement to support win16 dlls.  We do not have that
- * requirement, so we can drop that restriction.
+ * of certain OS requirements on platforms not supported by NSS.
  */
 
 #define DUMMY	/* dummy */

diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile
@@ -90,7 +90,7 @@ ifeq ($(OS_TARGET),OSF1)
     MPI_SRCS += mpvalpha.c
 endif
 
-ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))  #omits WIN16 and WINCE
+ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))  #omits WINCE
 ifndef USE_64
 # 32-bit Windows
 ifdef NS_USE_GCC

diff --git a/security/nss/lib/util/pkcs11.h b/security/nss/lib/util/pkcs11.h
@@ -74,12 +74,6 @@ extern "C" {
  *
  * #pragma pack(pop, cryptoki)
  *
- * In a Win16 environment, this might be done by using the
- * following preprocessor directive before including pkcs11.h
- * or pkcs11t.h:
- *
- * #pragma pack(1)
- *
  * In a UNIX environment, you're on your own here.  You might
  * not need to do anything.
  *
@@ -96,10 +90,6 @@ extern "C" {
  *
  * #define CK_PTR *
  *
- * In a Win16 environment, it might be defined by
- *
- * #define CK_PTR far *
- *
  * In a UNIX environment, it might be defined by
  *
  * #define CK_PTR *
@@ -124,12 +114,6 @@ extern "C" {
  * #define CK_DEFINE_FUNCTION(returnType, name) \
  *   returnType __declspec(dllexport) name
  *
- * For defining a function in a Win16 PKCS #11 .dll, it might be
- * defined by
- *
- * #define CK_DEFINE_FUNCTION(returnType, name) \
- *   returnType __export _far _pascal name
- *
  * In a UNIX environment, it might be defined by
  *
  * #define CK_DEFINE_FUNCTION(returnType, name) \
@@ -151,12 +135,6 @@ extern "C" {
  * #define CK_DECLARE_FUNCTION(returnType, name) \
  *   returnType __declspec(dllimport) name
  *
- * For declaring a function in a Win16 PKCS #11 .dll, it might
- * be defined by
- *
- * #define CK_DECLARE_FUNCTION(returnType, name) \
- *   returnType __export _far _pascal name
- *
  * In a UNIX environment, it might be defined by
  *
  * #define CK_DECLARE_FUNCTION(returnType, name) \
@@ -187,12 +165,6 @@ extern "C" {
  * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
  *   returnType __declspec(dllimport) (* name)
  *
- * For accessing functions in a Win16 PKCS #11 .dll, it might be
- * defined by
- *
- * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
- *   returnType __export _far _pascal (* name)
- *
  * In a UNIX environment, it might be defined by
  *
  * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
@@ -218,11 +190,6 @@ extern "C" {
  * #define CK_CALLBACK_FUNCTION(returnType, name) \
  *   returnType (* name)
  *
- * In a Win16 environment, it might be defined by
- *
- * #define CK_CALLBACK_FUNCTION(returnType, name) \
- *   returnType _far _pascal (* name)
- *
  * In a UNIX environment, it might be defined by
  *
  * #define CK_CALLBACK_FUNCTION(returnType, name) \

diff --git a/security/nss/lib/util/secasn1d.c b/security/nss/lib/util/secasn1d.c
@@ -2086,11 +2086,7 @@ sec_asn1d_concat_substrings (sec_asn1d_state *state)
 	}
 
 	if (is_bit_string) {
-#ifdef XP_WIN16		/* win16 compiler gets an internal error otherwise */
-	    alloc_len = (((long)item_len + 7) / 8);
-#else
 	    alloc_len = ((item_len + 7) >> 3);
-#endif
 	} else {
 	    /*
 	     * Add 2 for the end-of-contents octets of an indefinite-length

diff --git a/security/nss/lib/util/secport.h b/security/nss/lib/util/secport.h
@@ -57,11 +57,6 @@
 # ifndef XP_WIN32
 # define XP_WIN32
 # endif
-#else
-# ifndef XP_WIN16
-# define XP_WIN16
-# endif
-#endif
 #endif
 
 #ifdef __BEOS__

diff --git a/security/nss/trademarks.txt b/security/nss/trademarks.txt
@@ -113,7 +113,6 @@ URL             Uniform Resource Locator
 UTF-8           Unicode Transformation Format
 Unisys
 Verisign
-WIN16           Windows
 WIN32           Windows
 WINNT           Windows NT
 Windows