--- parser3/src/classes/mail.C	2012/06/08 11:44:02	1.119
+++ parser3/src/classes/mail.C	2015/04/02 22:18:25	1.122
@@ -19,7 +19,7 @@
 
 #include "smtp.h"
 
-volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.119 2012/06/08 11:44:02 misha Exp $";
+volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.122 2015/04/02 22:18:25 moko Exp $";
 
 // defines
 
@@ -66,7 +66,7 @@ static void sendmail(
 			const String* from,
 			const String* to,
 			const String* 
-#ifndef _MSC_VER
+#ifndef WIN32
 			 options
 #endif
 			 ) {
@@ -94,7 +94,7 @@ static void sendmail(
 		return;
 	}
 
-#if WIN32
+#ifdef WIN32
 	// win32 without SMTP server configured
 	throw Exception(PARSER_RUNTIME,
 		0,
@@ -109,7 +109,7 @@ static void sendmail(
 #ifdef PA_FORCED_SENDMAIL
 		throw Exception(PARSER_RUNTIME,
 			0,
-			"Parser was configured with --with-sendmail="PA_FORCED_SENDMAIL
+			"Parser was configured with --with-sendmail=" PA_FORCED_SENDMAIL
 			" key, to change sendmail you should reconfigure and recompie it");
 #else
 		if(Value* sendmail_value=vmail_conf->get_hash()->get(mail_sendmail_name))
@@ -117,7 +117,7 @@ static void sendmail(
 		else
 			throw Exception(PARSER_RUNTIME,
 				0,
-				"$"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" not defined");
+				"$" MAIN_CLASS_NAME ":" MAIL_NAME "." SENDMAIL_NAME " not defined");
 #endif
 	} else {
 #ifdef PA_FORCED_SENDMAIL
@@ -161,7 +161,7 @@ static void sendmail(
 #ifdef PA_FORCED_SENDMAIL
 			" Use configure key \"--with-sendmail=appropriate sendmail command\""
 #else
-			" Set $"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" to appropriate sendmail command"
+			" Set $" MAIN_CLASS_NAME ":" MAIL_NAME "." SENDMAIL_NAME " to appropriate sendmail command"
 #endif
 		);
 
@@ -185,7 +185,7 @@ static void sendmail(
 				file_spec->cstr(),
 				exec.err.length()?exec.err.cstr():"UNKNOWN", 
 				exec.status);
-#endif
+#endif //WIN32
 }
 
 // methods