From c30bd7cdf0c165cdeec50c405285b8c4354513f7 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com"
 <wtc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 21 Feb 2003 00:41:24 +0000
Subject: [PATCH] Bug 194309: replaced freebl_GetLibraryFilePathname by the new
 NSPR 4.3 function PR_GetLibraryFilePathname. Modified files: config.mk
 manifest.mn shvfy.c

git-svn-id: svn://10.0.0.236/trunk@138057 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/lib/freebl/config.mk   |  5 -----
 mozilla/security/nss/lib/freebl/manifest.mn |  1 -
 mozilla/security/nss/lib/freebl/shvfy.c     | 11 ++---------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/mozilla/security/nss/lib/freebl/config.mk b/mozilla/security/nss/lib/freebl/config.mk
index c3ffb1dcc2d..6bae7893b39 100644
--- a/mozilla/security/nss/lib/freebl/config.mk
+++ b/mozilla/security/nss/lib/freebl/config.mk
@@ -100,9 +100,4 @@ PROGRAM      =
 	-lc
 #endif
 
-ifeq ($(OS_TARGET), SunOS)
-  EXTRA_LIBS        += \
-	-ldl
-endif
-
 endif
diff --git a/mozilla/security/nss/lib/freebl/manifest.mn b/mozilla/security/nss/lib/freebl/manifest.mn
index 606a311546c..409c10d00c6 100644
--- a/mozilla/security/nss/lib/freebl/manifest.mn
+++ b/mozilla/security/nss/lib/freebl/manifest.mn
@@ -97,7 +97,6 @@ CSRCS = \
 	dsa.c \
 	rsa.c \
 	shvfy.c \
-	libpath.c \
 	$(MPI_SRCS) \
 	$(NULL)
 endif
diff --git a/mozilla/security/nss/lib/freebl/shvfy.c b/mozilla/security/nss/lib/freebl/shvfy.c
index d560fdacdb9..5ab5de81c5c 100644
--- a/mozilla/security/nss/lib/freebl/shvfy.c
+++ b/mozilla/security/nss/lib/freebl/shvfy.c
@@ -33,7 +33,7 @@
  *
  * shvfy.c - routines to verify signature on a shared library.
  *
- * $Id: shvfy.c,v 1.4 2003-02-14 05:32:35 wtc%netscape.com Exp $
+ * $Id: shvfy.c,v 1.5 2003-02-21 00:41:24 wtc%netscape.com Exp $
  */
 
 #include "shsign.h"
@@ -43,13 +43,6 @@
 #include "seccomon.h"
 #include "stdio.h"
 
-#ifndef NSPR_HAS_FILEPATH_FUNC
-char *
-freebl_GetLibraryFilePathname(const char *name, PRFuncPtr addr);
-#else
-#define freebl_GetLibraryFilePathname NSPR_GetLibraryFilePathname
-#endif
-
 /* #define DEBUG_SHVERIFY 1 */
 
 static char *
@@ -107,7 +100,7 @@ PRBool
 BLAPI_SHVerify(const char *name, PRFuncPtr addr)
 {
     /* find our shared library name */
-    char *shName = freebl_GetLibraryFilePathname(name, addr);
+    char *shName = PR_GetLibraryFilePathname(name, addr);
     char *checkName = NULL;
     PRFileDesc *checkFD = NULL;
     PRFileDesc *shFD = NULL;