remove NSPR20 and flip logic for NSPR 1.0 compatibility

modules/libpref/src/Makefile

@@ -22,8 +22,6 @@ LIBRARY_NAME	= pref
 
 REQUIRES	= libxp js pref nspr dbm security ldap java img layer util
 
-DEFINES		+= -DNSPR20
-
 ifneq ($(subst /,_,$(shell uname -s)),OS2)
 CSRCS		= unix/unixpref.c
 else
@@ -97,8 +95,6 @@ EXPORTS += $(CONFIG_FILE_EXPORTS)
 
 include $(DEPTH)/config/rules.mk
 
-DEFINES += -DNSPR20
-
 # VPATH allows us to make sure the auto-generation rule works for
 # everything in VPATH (so init/all.js->pref_all.h etc)
 VPATH += init/ unix/

modules/libpref/src/prefapi.c

@@ -49,7 +49,8 @@
 #define LINEBREAK "\n"
 #endif
 #include "sechash.h"
-#ifndef NSPR20
+/* NSPR 1.0 compatability */
+#ifdef NSPR
 #include "prhash.h"
 #else
 #include "plhash.h"
@@ -2055,7 +2056,7 @@ JSBool PR_CALLBACK pref_NativeGetLDAPAttr
 		
 	if (m_AutoAdminLib) {
 		get_ldap_attributes = (ldap_func)
-#ifndef NSPR20
+#ifdef NSPR
 			PR_FindSymbol(
 #ifndef XP_WIN16
 			"pref_get_ldap_attributes"
@@ -2063,7 +2064,7 @@ JSBool PR_CALLBACK pref_NativeGetLDAPAttr
 			MAKEINTRESOURCE(1)
 #endif
 			, m_AutoAdminLib);
-#else /* NSPR20 */
+#else /* NSPR */
 			PR_FindSymbol(
 			 m_AutoAdminLib,
 #ifndef XP_WIN16
@@ -2072,7 +2073,7 @@ JSBool PR_CALLBACK pref_NativeGetLDAPAttr
 			MAKEINTRESOURCE(1)
 #endif
 			);
-#endif /* NSPR20 */
+#endif /* NSPR */
 	}
 	if (get_ldap_attributes == NULL) {
 		/* This indicates the AutoAdmin dll was not found. */
@@ -2311,7 +2312,7 @@ pref_LoadAutoAdminLib()
 	}
 	/* Make sure it's really libAutoAdmin.so */
     
-#ifndef NSPR20
+#ifdef NSPR
 	if ( lib && PR_FindSymbol("_POLARIS_SplashPro", lib) == NULL ) return NULL;
 #else 
 	if ( lib && PR_FindSymbol(lib, "_POLARIS_SplashPro") == NULL ) return NULL;

modules/libpref/src/prefapi.cpp

@@ -49,7 +49,8 @@
 #define LINEBREAK "\n"
 #endif
 #include "sechash.h"
-#ifndef NSPR20
+/* NSPR 1.0 compatability */
+#ifdef NSPR
 #include "prhash.h"
 #else
 #include "plhash.h"
@@ -2055,7 +2056,7 @@ JSBool PR_CALLBACK pref_NativeGetLDAPAttr
 		
 	if (m_AutoAdminLib) {
 		get_ldap_attributes = (ldap_func)
-#ifndef NSPR20
+#ifdef NSPR
 			PR_FindSymbol(
 #ifndef XP_WIN16
 			"pref_get_ldap_attributes"
@@ -2063,7 +2064,7 @@ JSBool PR_CALLBACK pref_NativeGetLDAPAttr
 			MAKEINTRESOURCE(1)
 #endif
 			, m_AutoAdminLib);
-#else /* NSPR20 */
+#else /* NSPR */
 			PR_FindSymbol(
 			 m_AutoAdminLib,
 #ifndef XP_WIN16
@@ -2072,7 +2073,7 @@ JSBool PR_CALLBACK pref_NativeGetLDAPAttr
 			MAKEINTRESOURCE(1)
 #endif
 			);
-#endif /* NSPR20 */
+#endif /* NSPR */
 	}
 	if (get_ldap_attributes == NULL) {
 		/* This indicates the AutoAdmin dll was not found. */
@@ -2311,7 +2312,7 @@ pref_LoadAutoAdminLib()
 	}
 	/* Make sure it's really libAutoAdmin.so */
     
-#ifndef NSPR20
+#ifdef NSPR
 	if ( lib && PR_FindSymbol("_POLARIS_SplashPro", lib) == NULL ) return NULL;
 #else 
 	if ( lib && PR_FindSymbol(lib, "_POLARIS_SplashPro") == NULL ) return NULL;