Rebake for 2.6.2

[wxWidgets.git] / contrib / src / net / smapi.cpp

diff --git a/contrib/src/net/smapi.cpp b/contrib/src/net/smapi.cpp
index 059129c5156715ad92920744cb6856a04af2a35d..95b3287d62b1ee9ad2edc491ceef1396715924cf 100644 (file)
--- a/contrib/src/net/smapi.cpp
+++ b/contrib/src/net/smapi.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#ifdef __WXMSW__
+
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -27,7 +29,15 @@
 #include "wx/string.h"
 #include "wx/msw/private.h"
 
+// mapi.h in Cygwin's include directory isn't a full implementation and is
+// not sufficient for this lib. However recent versions of Cygwin also
+// have another mapi.h in include/w32api which can be used.
+//
+#ifdef __CYGWIN__
+#include <w32api/mapi.h>
+#else
 #include <mapi.h>
+#endif
 
 #include "wx/net/smapi.h"
 
@@ -462,7 +472,7 @@ bool wxMapiSession::Send(wxMailMessage& message)
     if (nAttachmentSize)
     {
 #ifdef UNICODE
-        for (int i = 0;i < nAttachmentSize;i++)
+        for (i = 0;i < nAttachmentSize;i++)
         {
             free(mapiMessage.lpFiles[i].lpszPathName);
             free(mapiMessage.lpFiles[i].lpszFileName);
@@ -473,7 +483,7 @@ bool wxMapiSession::Send(wxMailMessage& message)
     
     //Free up the Recipients and Originator memory
 #ifdef UNICODE
-    for (int i = 0;i < nRecipIndex;i++)
+    for (i = 0;i < nRecipIndex;i++)
         free(mapiMessage.lpRecips[i].lpszName);
 #endif
     delete [] mapiMessage.lpRecips;
@@ -487,3 +497,5 @@ long wxMapiSession::GetLastError() const
 {
     return m_data->m_nLastError;
 }
+
+#endif // __WXMSW__