From 7f7e6c6d70fdaffe7409aaffa2f666cd1e53630e Mon Sep 17 00:00:00 2001 From: "wtc%netscape.com" Date: Sat, 7 Sep 2002 05:35:46 +0000 Subject: [PATCH] Bug 123753: the softoken is now compiled the same way for servers and clients, so removed the "for Clients" string in the version info. Modified files: config.mk softokn.rc git-svn-id: svn://10.0.0.236/trunk@129036 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/softoken/config.mk | 5 ----- mozilla/security/nss/lib/softoken/softokn.rc | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/mozilla/security/nss/lib/softoken/config.mk b/mozilla/security/nss/lib/softoken/config.mk index 0d72934be14..d2e7a8231a0 100644 --- a/mozilla/security/nss/lib/softoken/config.mk +++ b/mozilla/security/nss/lib/softoken/config.mk @@ -31,11 +31,6 @@ # GPL. # - -ifdef MOZILLA_CLIENT -DEFINES += -DMOZ_CLIENT -endif - # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS) CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) CRYPTODIR=../freebl diff --git a/mozilla/security/nss/lib/softoken/softokn.rc b/mozilla/security/nss/lib/softoken/softokn.rc index f2a4cb64900..cb93c8c6880 100644 --- a/mozilla/security/nss/lib/softoken/softokn.rc +++ b/mozilla/security/nss/lib/softoken/softokn.rc @@ -35,11 +35,6 @@ #include #define MY_LIBNAME "softokn" -#ifdef MOZ_CLIENT -#define CLIENTS " for Clients" -#else -#define CLIENTS "" -#endif #ifdef REMOTE_DBM #define DBM " with Shared Database" @@ -47,7 +42,7 @@ #define DBM "" #endif -#define MY_FILEDESCRIPTION "NSS PKCS #11 Library" CLIENTS DBM +#define MY_FILEDESCRIPTION "NSS PKCS #11 Library" DBM #define STRINGIZE(x) #x #define STRINGIZE2(x) STRINGIZE(x)