Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs1:/tmp/cvs-serv5117/src/mail
Modified Files:
MailFolderCC.cpp MailFolderCmn.cpp MailMH.cpp
SendMessageCC.cpp
Log Message:
Mahogany can now be compiled with cygwin's -mno-cygwin switch (mingw)
Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.668
retrieving revision 1.669
diff -b -u -2 -r1.668 -r1.669
--- MailFolderCC.cpp 23 Jun 2003 01:23:46 -0000 1.668
+++ MailFolderCC.cpp 15 Jul 2003 00:47:34 -0000 1.669
@@ -29,5 +29,5 @@
# include "MApplication.h"
# include "Profile.h"
-#ifdef __CYGWIN__
+#ifdef OS_WIN // cygwin and mingw
# include <wx/timer.h>
#endif
@@ -74,9 +74,9 @@
// windows.h included from fontutil.h defines ERROR
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__MINGW32__)
# undef ERROR
#endif
#include <wx/fontmap.h> // DecodeHeader() uses CharsetToEncoding()
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__MINGW32__)
# undef ERROR
# define ERROR (long) 2 // HACK - redefine again as in extra/src/c-client/mail.h
Index: MailFolderCmn.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCmn.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -b -u -2 -r1.113 -r1.114
--- MailFolderCmn.cpp 23 Jun 2003 01:23:46 -0000 1.113
+++ MailFolderCmn.cpp 15 Jul 2003 00:47:34 -0000 1.114
@@ -1951,5 +1951,5 @@
String sound = READ_CONFIG(profile, MP_NEWMAIL_SOUND_FILE);
-#if defined(OS_WIN) && !defined(__CYGWIN__)
+#if defined(OS_WIN) && !defined(__CYGWIN__) && !defined(__MINGW32__) // FIXME
DWORD flags = SND_ASYNC;
@@ -1979,4 +1979,5 @@
if ( !wxExecute(command, false /* async */) )
+#elif defined(__MINGW32__)
#else // other platform
#error "don't know how to play sounds on this platform"
Index: MailMH.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailMH.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -2 -r1.11 -r1.12
--- MailMH.cpp 23 Jun 2003 01:23:46 -0000 1.11
+++ MailMH.cpp 15 Jul 2003 00:47:34 -0000 1.12
@@ -28,5 +28,5 @@
# include "ASMailFolder.h"
-#ifdef __CYGWIN__
+#ifdef OS_WIN // cygwin and mingw
# include "MApplication.h" // for mApplication
#endif
Index: SendMessageCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/SendMessageCC.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -b -u -2 -r1.207 -r1.208
--- SendMessageCC.cpp 1 Jun 2003 22:48:27 -0000 1.207
+++ SendMessageCC.cpp 15 Jul 2003 00:47:34 -0000 1.208
@@ -48,5 +48,5 @@
// defines SendMessage under Windows
#include <wx/fontmap.h> // for GetEncodingName()
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__MINGW32__)
# undef SendMessage
#endif
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
