From 346d28c2bfcda450040cdb0423f9dff09802c295 Mon Sep 17 00:00:00 2001 From: "relyea%netscape.com" Date: Thu, 10 Oct 2002 20:11:09 +0000 Subject: [PATCH] Unix and Mac platforms need to load librdb.* not rdb.*. git-svn-id: svn://10.0.0.236/trunk@131703 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/softoken/dbinit.c | 4 ++-- mozilla/security/nss/lib/softoken/manifest.mn | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/security/nss/lib/softoken/dbinit.c b/mozilla/security/nss/lib/softoken/dbinit.c index a44a8747229..3a6b5e7a906 100644 --- a/mozilla/security/nss/lib/softoken/dbinit.c +++ b/mozilla/security/nss/lib/softoken/dbinit.c @@ -32,7 +32,7 @@ * may use your version of this file under either the MPL or the * GPL. * - # $Id: dbinit.c,v 1.16 2002-09-06 00:27:48 wtc%netscape.com Exp $ + # $Id: dbinit.c,v 1.17 2002-10-10 20:11:09 relyea%netscape.com Exp $ */ #include @@ -275,7 +275,7 @@ static int rdbmapflags(int flags); static rdbfunc pk11_rdbfunc; /* NOTE: SHLIB_SUFFIX is defined on the command line */ -#define RDBLIB "rdb."SHLIB_SUFFIX +#define RDBLIB SHLIB_PREFIX"rdb."SHLIB_SUFFIX DB * rdbopen(const char *appName, const char *prefix, const char *type, int flags) diff --git a/mozilla/security/nss/lib/softoken/manifest.mn b/mozilla/security/nss/lib/softoken/manifest.mn index 2d43a9db46b..b362e31d0fb 100644 --- a/mozilla/security/nss/lib/softoken/manifest.mn +++ b/mozilla/security/nss/lib/softoken/manifest.mn @@ -40,7 +40,7 @@ LIBRARY_NAME = softokn LIBRARY_VERSION = 3 MAPFILE = $(OBJDIR)/softokn.def -DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" +DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" EXPORTS = \