Whomp the SECURITY_CLIENT_BRANCH onto the tip.

git-svn-id: svn://10.0.0.236/trunk@77779 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/security/psm/lib/client/cmtcmn.h

@@ -120,7 +120,7 @@ typedef CMTStatus (*CMT_VERIFY_UNIX)(CMTSocket sock);
 /*
  * Use this function to send data across the socket
  */
-typedef size_t (*CMT_SEND)(CMTSocket sock, void* buffer, size_t length);
+typedef CMInt32 (*CMT_SEND)(CMTSocket sock, void* buffer, size_t length);
 
 /*
  * Use this function to select a socket. If poll is non-zero, then 
@@ -134,7 +134,7 @@ typedef CMTSocket (*CMT_SELECT)(CMTSocket *sock, int numSocks, int poll);
  * Use this function to receive data from a socket.  Function should
  * return number of bytes actually read. Return -1 in case of error.
  */
-typedef size_t (*CMT_RECEIVE)(CMTSocket sock, void *buffer, size_t bufSize);
+typedef CMInt32 (*CMT_RECEIVE)(CMTSocket sock, void *buffer, size_t bufSize);
 
 /*
  * Use this function to shutdown writing to the socket.

mozilla/security/psm/lib/client/cmtpkcs7.c

@@ -613,7 +613,7 @@ loser:
 CMTStatus CMT_PKCS7EncoderFinish(PCMT_CONTROL control, CMUint32 connectionID)
 {
     CMTP7Private *priv;
-    unsigned long nbytes;
+    CMInt32 nbytes;
     char buf[128];
     CMTSocket sock, ctrlsock, sockArr[2], selSock;
 

mozilla/security/psm/lib/client/makefile.win

@@ -95,6 +95,11 @@ OBJS=                         \
 	.\$(OBJDIR)\cmtsdr.obj \
     $(NULL)
 
+EXPORTS = \
+    .\cmtcmn.h \
+    .\cmtclist.h \
+    $(NULL)
+
 #//------------------------------------------------------------------------
 #//
 #// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)

mozilla/security/psm/lib/protocol/makefile.win

@@ -85,6 +85,10 @@ OBJS=                         \
     .\$(OBJDIR)\protocolshr.obj \
     $(NULL)
 
+EXPORTS = \
+    .\ssmdefs.h \
+    $(NULL)
+
 #//------------------------------------------------------------------------
 #//
 #// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)