--- parser3/src/lib/smtp/smtp.C	2005/08/05 13:03:00	1.7.14.1
+++ parser3/src/lib/smtp/smtp.C	2020/12/15 17:10:33	1.15
@@ -1,21 +1,21 @@
 /** @file
 	Parser: SMTP sender.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
 	Parts of the code here is based upon an early gensock and blat
 */
 
-static const char * const IDENT_SMTP_C="$Date: 2005/08/05 13:03:00 $";
-
 #include "pa_exception.h"
 #include "smtp.h"
 
-#undef snprintf
+volatile const char * IDENT_SMTP_C="$Id: smtp.C,v 1.15 2020/12/15 17:10:33 moko Exp $" IDENT_SMTP_H;
+
 // pa_common.C
-extern int __snprintf(char *, size_t, const char* , ...);
-#define snprintf __snprintf
+#undef snprintf
+extern int pa_snprintf(char *, size_t, const char* , ...);
+#define snprintf pa_snprintf
 
 //#define DEBUG_SHOW
 
@@ -27,15 +27,15 @@ SMTP::SMTP() {
     in_buffer_total  = 0;
     out_buffer_total = 0;
 
-    in_buffer  = (char *)malloc(SOCKET_BUFFER_SIZE);
-    out_buffer = (char *)malloc(SOCKET_BUFFER_SIZE);
+    in_buffer  = (char *)pa_malloc(SOCKET_BUFFER_SIZE);
+    out_buffer = (char *)pa_malloc(SOCKET_BUFFER_SIZE);
 
     last_winsock_error = 0;
 }
 
 SMTP::~SMTP() {
-	free(in_buffer);
-    free(out_buffer);
+    pa_free(in_buffer);
+    pa_free(out_buffer);
 }
 
 
@@ -98,7 +98,7 @@ GetBuffer(int wait)
 
     if( (retval = select(1+the_socket, &fds, NULL, NULL, &timeout))<0 )
     {
-#ifdef WIN32
+#ifdef _MSC_VER
         int     error_code = WSAGetLastError();
 
         if( error_code == WSAEINPROGRESS && wait )