diff options
| author | wtchang%redhat.com <devnull@localhost> | 2006-12-06 19:28:05 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2006-12-06 19:28:05 +0000 |
| commit | e2d5014b0cd5a9d5c2c6942d828a689f048f57c2 (patch) | |
| tree | 0fb957af82daabb9bb57a727e742fe0348e1925f | |
| parent | f3a68157562d53c5da424116c2a87acddc1bbdff (diff) | |
| download | nss-hg-e2d5014b0cd5a9d5c2c6942d828a689f048f57c2.tar.gz | |
Bugzilla Bug 362857: simplified the NSS version string definition and set
the NSS version to 3.11.5 Beta. r=christophe.ravel,nelsonb.
Tag: NSS_3_11_BRANCH
| -rw-r--r-- | security/nss/lib/nss/nss.h | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 300748f41..bce371a1b 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -45,26 +45,29 @@ SEC_BEGIN_PROTOS -/* - * NSS's major version, minor version, patch level, and whether - * this is a beta release. - * - * The format of the version string should be - * "<major version>.<minor version>[.<patch level>] [<Beta>]" - */ +/* The private macro _NSS_ECC_STRING is for NSS internal use only. */ #ifdef NSS_ENABLE_ECC #ifdef NSS_ECC_MORE_THAN_SUITE_B -#define NSS_VERSION "3.11.4 Extended ECC" +#define _NSS_ECC_STRING " Extended ECC" #else -#define NSS_VERSION "3.11.4 Basic ECC" +#define _NSS_ECC_STRING " Basic ECC" #endif #else -#define NSS_VERSION "3.11.4" +#define _NSS_ECC_STRING "" #endif + +/* + * NSS's major version, minor version, patch level, and whether + * this is a beta release. + * + * The format of the version string should be + * "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]" + */ +#define NSS_VERSION "3.11.5" _NSS_ECC_STRING " Beta" #define NSS_VMAJOR 3 #define NSS_VMINOR 11 -#define NSS_VPATCH 4 -#define NSS_BETA PR_FALSE +#define NSS_VPATCH 5 +#define NSS_BETA PR_TRUE /* * Return a boolean that indicates whether the underlying library |