From: Howard Chu <hyc@openldap.org>
Date: Thu, 27 Jan 2011 21:43:22 +0000 (+0000)
Subject: Cleanup version checking
X-Git-Tag: MIGRATION_CVS2GIT~174
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2d545befdd0653f7db9d9981460b93650d842861;p=openldap

Cleanup version checking
---

diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
index 36d32761de..8c7ecf872e 100644
--- a/libraries/libldap/tls_m.c
+++ b/libraries/libldap/tls_m.c
@@ -61,17 +61,17 @@
 #include <nss/secmod.h>
 #include <nss/cert.h>
 
+#undef NSS_VERSION_INT
+#define	NSS_VERSION_INT	((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \
+	(NSS_VPATCH << 8) | NSS_VBUILD)
+
 /* NSS 3.12.5 and later have NSS_InitContext */
-#if NSS_VMAJOR <= 3 && NSS_VMINOR <= 12 && NSS_VPATCH < 5
-/* do nothing */
-#else
+#if NSS_VERSION_INT >= 0x030c0500
 #define HAVE_NSS_INITCONTEXT 1
 #endif
 
 /* NSS 3.12.9 and later have SECMOD_RestartModules */
-#if NSS_VMAJOR <= 3 && NSS_VMINOR <= 12 && NSS_VPATCH < 9
-/* do nothing */
-#else
+#if NSS_VERSION_INT >= 0x030c0900
 #define HAVE_SECMOD_RESTARTMODULES 1
 #endif