diff options
| author | nelsonb%netscape.com <devnull@localhost> | 2001-06-19 01:16:22 +0000 |
|---|---|---|
| committer | nelsonb%netscape.com <devnull@localhost> | 2001-06-19 01:16:22 +0000 |
| commit | fea2e130cccd9522895f79f88cf63d7065498aea (patch) | |
| tree | 2ea8a92f17d65559fd14fe7fb1d7887fdaccdbe1 | |
| parent | f45d0aabfff2d0f49a948ce1b0a64e92ed14dc5f (diff) | |
| download | nss-hg-fea2e130cccd9522895f79f88cf63d7065498aea.tar.gz | |
Remove #if defined(XP_WIN) since it's redundant. Bug 84584.
| -rw-r--r-- | security/nss/lib/softoken/pkcs11p.h | 6 | ||||
| -rw-r--r-- | security/nss/lib/softoken/pkcs11u.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/security/nss/lib/softoken/pkcs11p.h b/security/nss/lib/softoken/pkcs11p.h index 9876ad3ac..0a30e8ee4 100644 --- a/security/nss/lib/softoken/pkcs11p.h +++ b/security/nss/lib/softoken/pkcs11p.h @@ -32,7 +32,7 @@ */ /* * Copyright (C) 1994-1999 RSA Security Inc. Licence to copy this document - * is granted provided that it is identified as "RSA Security In.c Public-Key + * is granted provided that it is identified as "RSA Security Inc. Public-Key * Cryptography Standards (PKCS)" in all material mentioning or referencing * this document. */ @@ -41,9 +41,9 @@ * Packing was removed from the shipped RSA header files, even * though it's still needed. put in a central file to help merging.. */ -#if defined(XP_WIN) + #if defined(_WIN32) #pragma warning(disable:4103) #pragma pack(push, cryptoki, 1) #endif -#endif + diff --git a/security/nss/lib/softoken/pkcs11u.h b/security/nss/lib/softoken/pkcs11u.h index 8b3c6dbd5..0addf0f6f 100644 --- a/security/nss/lib/softoken/pkcs11u.h +++ b/security/nss/lib/softoken/pkcs11u.h @@ -32,17 +32,16 @@ */ /* * Copyright (C) 1994-1999 RSA Security Inc. Licence to copy this document - * is granted provided that it is identified as "RSA Security In.c Public-Key + * is granted provided that it is identified as "RSA Security Inc. Public-Key * Cryptography Standards (PKCS)" in all material mentioning or referencing * this document. */ /* * reset any packing set by pkcs11p.h */ -#if defined(XP_WIN) + #if defined (_WIN32) #pragma warning(disable:4103) #pragma pack(pop, cryptoki) #endif -#endif |