Fixes to make Mac compile.

security/psm/lib/protocol/obspriv.c

@@ -32,6 +32,7 @@
  */
 #include "obspriv.h"
 #include "newproto.h"
+#include <string.h>
 #include <assert.h>
 #include <time.h>
 

security/psm/server/certres.c

@@ -1997,7 +1997,7 @@ SSM_CertListCount(CERTCertList *certList)
 
 /* ### mwelch - PKCS11 private function? Need prototype for Mac */
 #ifdef XP_MAC
-extern "C" CERTCertList *
+CERTCertList *
 PK11_FindCertsFromNickname(char *nickname, void *wincx);
 #endif
 

security/psm/server/ctrlconn.c

@@ -1064,10 +1064,7 @@ static int ssm_ask_pref_to_pk11(int asktype)
 }
 
 #ifdef XP_MAC
-extern "C"
-{
-	OSErr ConvertMacPathToUnixPath(const char *macPath, char **unixPath);
-}
+extern OSErr ConvertMacPathToUnixPath(const char *macPath, char **unixPath);
 #endif
 
 /* Set up profile and password information. */

security/psm/server/dataconn.h

@@ -83,6 +83,7 @@ typedef struct SSMDataConnection
                                       (usage depends on subclass) */
 } SSMDataConnection;
 
+PR_BEGIN_EXTERN_C
 
 PRBool AreConnectionsActive(void);
 
@@ -141,5 +142,6 @@ SSMStatus SSMDataConnection_SetupClientSocket(SSMDataConnection* conn);
 SSMStatus SSMDataConnection_ReadFromSocket(SSMDataConnection* conn,
                                           PRInt32* read,
                                           char* buffer);
+PR_END_EXTERN_C
 
 #endif

security/psm/server/main.c

@@ -45,6 +45,7 @@
 #include "nss.h"
 #include "p12plcy.h"
 #include "nlslayer.h"
+#include "softoken.h"
 
 void SSM_InitLogging(void);
 
@@ -359,12 +360,10 @@ psm_catch_signals(void)
 }
 #endif
 
-
 #if defined(XP_PC) && !defined(DEBUG)
 int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,
                    LPSTR lpszLine, int nShow)
-#else
-#ifdef macintosh
+#elif defined(XP_MAC)
 /*
 	We run RunMacPSM in a separate thread off the main thread. 
 	This is because we can't do any blocking I/O routines on the main
@@ -375,12 +374,11 @@ void RunMacPSM(void *arg)
 #else
 int main(int argc, char ** argv)
 #endif
-#endif
 {
-#ifdef macintosh
+#ifdef XP_MAC
 #pragma unused(arg)
 #endif
-#if (defined(XP_PC) && !defined(DEBUG)) || (defined(macintosh))
+#if (defined(XP_PC) && !defined(DEBUG)) || (defined(XP_MAC))
     /* substitute argc and argv for NSPR */
     int argc = 0;
     char *argv[] = {"", NULL};

security/psm/server/p12res.c

@@ -417,7 +417,7 @@ SSM_UCS2_ASCIIConversion(PRBool toUnicode,
         unsigned int i;
         char tmp;
 
-        for (i=0; i<outBufLen; i+=2) {
+        for (i=0; i<*outBufLen; i+=2) {
             tmp = outBuf[i];
             outBuf[i]   = outBuf[i+1];
             outBuf[i+1] = tmp;

security/psm/server/servutil.c

@@ -281,9 +281,6 @@ SSM_AddLogSocket(PRFileDesc *fd)
     return rv;
 }
 
-#ifdef XP_MAC
-#include "macglue.h"
-#endif
 
 /* Called by a newly created thread, this associates a name with the thread. */
 void
@@ -300,7 +297,7 @@ SSM_RegisterThread(char *threadName, SSMResource *ptr)
     	necessary because when a thread exits, we want it to delete itself
     	from the list of threads we need to kill at exit time. 
     */
-    {
+    { 
       PRUintn threadIndex = GetThreadIndex();
       if (threadIndex > 0)
       	PR_SetThreadPrivate(threadIndex, PR_GetCurrentThread());

security/psm/server/signtextres.c

@@ -39,6 +39,7 @@
 #include "newproto.h"
 #include "messages.h"
 #include "certres.h"
+#include "sechash.h"
 
 #define SSMRESOURCE(object) (&(object)->super)