From d806ea955be68c4dfcd03fc82c8c10fe4762ccd4 Mon Sep 17 00:00:00 2001
From: "kaie%netscape.com"
 <kaie%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 28 Jan 2002 15:23:59 +0000
Subject: [PATCH] b=98068 Add PR_CALLBACK for changed interfaces in NSS_3_4
 r=javi sr=blizzard

git-svn-id: svn://10.0.0.236/trunk@113039 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp | 7 ++++++-
 mozilla/security/manager/ssl/src/nsNSSCallbacks.h   | 8 +++++++-
 mozilla/security/manager/ssl/src/nsNSSComponent.cpp | 7 ++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp b/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp
index dd5f4954576..9f56f1fd0de 100644
--- a/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp
@@ -115,7 +115,12 @@ nsSSLStatus::~nsSSLStatus()
 }
 
 
-char* PK11PasswordPrompt(PK11SlotInfo* slot, PRBool retry, void* arg) {
+#ifdef NSS_3_4
+char* PR_CALLBACK
+#else
+char*
+#endif
+PK11PasswordPrompt(PK11SlotInfo* slot, PRBool retry, void* arg) {
   nsresult rv = NS_OK;
   PRUnichar *password = nsnull;
   PRBool value = PR_FALSE;
diff --git a/mozilla/security/manager/ssl/src/nsNSSCallbacks.h b/mozilla/security/manager/ssl/src/nsNSSCallbacks.h
index 8cb5caf847b..c839da9d92e 100644
--- a/mozilla/security/manager/ssl/src/nsNSSCallbacks.h
+++ b/mozilla/security/manager/ssl/src/nsNSSCallbacks.h
@@ -27,7 +27,13 @@
 #include "pk11func.h"
 #include "nspr.h"
 
-char* PK11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void* arg);
+#ifdef NSS_3_4
+char* PR_CALLBACK
+#else
+char*
+#endif
+PK11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void* arg);
+
 void PR_CALLBACK HandshakeCallback(PRFileDesc *fd, void *client_data);
 SECStatus PR_CALLBACK AuthCertificateCallback(void* client_data, PRFileDesc* fd,
                                               PRBool checksig, PRBool isServer);
diff --git a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
index 1fc7acc4250..410d5e97ed0 100644
--- a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
@@ -116,7 +116,12 @@ OSErr ConvertMacPathToUnixPath(const char *macPath, char **unixPath)
 #endif
 
 // XXX tmp callback for slot password
-extern char * pk11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void *arg);
+#ifdef NSS_3_4
+extern char * PR_CALLBACK 
+#else
+extern char *
+#endif
+pk11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void *arg);
 
 #define PIPNSS_STRBUNDLE_URL "chrome://pipnss/locale/pipnss.properties"