b=98068 Add PR_CALLBACK for changed interfaces in NSS_3_4

r=javi sr=blizzard

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;

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);

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"