Bunch of changes.

SendMail.h

@@ -7,7 +7,11 @@
 #include "Timer.h"
 
 #define CRLF "\r\n"
+#define CRLF "\r\n"
+#ifndef ___state_defined___
+#define ___state_defined___
 typedef enum {CONNECT, READY, READYX, MAIL, RCPT, DATA, SENT} State;
+#endif
 
 namespace mail {