Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3563/src/mail
Modified Files:
MailFolderCC.cpp MailFolderCmn.cpp MailMH.cpp
SendMessageCC.cpp
Log Message:
compilation with wxWine
Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.716
retrieving revision 1.717
diff -b -u -2 -r1.716 -r1.717
--- MailFolderCC.cpp 27 May 2006 14:43:49 -0000 1.716
+++ MailFolderCC.cpp 4 Sep 2006 23:15:36 -0000 1.717
@@ -79,14 +79,14 @@
// windows.h included from fontutil.h defines ERROR
-#if defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WINE__)
# undef ERROR
#endif
#include <wx/fontmap.h> // DecodeHeader() uses CharsetToEncoding()
-#if defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WINE__)
# undef ERROR
# define ERROR (long) 2 // HACK - redefine again as in
extra/src/c-client/mail.h
#endif
-#if defined(OS_UNIX) && !defined(__CYGWIN__)
+#if defined(OS_UNIX) && !defined(__CYGWIN__) && !defined(__WINE__)
#include <signal.h>
@@ -4862,5 +4862,5 @@
mail_parameters(NULL, SET_DISABLE822TZTEXT, (void *)1);
-#if defined(OS_UNIX) && !defined(__CYGWIN__)
+#if defined(OS_UNIX) && !defined(__CYGWIN__) && !defined(__WINE__)
// install our own sigpipe handler to ignore (and not die) if a SIGPIPE
// happens
Index: MailFolderCmn.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCmn.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -b -u -2 -r1.137 -r1.138
--- MailFolderCmn.cpp 16 Jan 2006 20:32:28 -0000 1.137
+++ MailFolderCmn.cpp 4 Sep 2006 23:15:37 -0000 1.138
@@ -1947,5 +1947,5 @@
String sound = READ_CONFIG(profile, MP_NEWMAIL_SOUND_FILE);
-#if defined(OS_WIN) && !defined(__CYGWIN__) && !defined(__MINGW32__) // FIXME
+#if defined(OS_WIN) && !defined(__CYGWIN__) && !defined(__MINGW32__) &&
!defined(__WINE__) // FIXME
DWORD flags = SND_ASYNC;
@@ -1975,5 +1975,5 @@
if ( !wxExecute(command, false /* async */) )
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) || defined(__WINE__)
#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.18
retrieving revision 1.19
diff -b -u -2 -r1.18 -r1.19
--- MailMH.cpp 16 Jan 2006 20:32:28 -0000 1.18
+++ MailMH.cpp 4 Sep 2006 23:15:37 -0000 1.19
@@ -30,5 +30,8 @@
#ifdef OS_WIN // cygwin and mingw
# include "MApplication.h" // for mApplication
-#endif
+#ifdef __WINE__
+# include "Mdefaults.h" // for READ_APPCONFIG
+#endif // __WINE__
+#endif // OS_WIN
#endif // USE_PCH
Index: SendMessageCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/SendMessageCC.cpp,v
retrieving revision 1.234
retrieving revision 1.235
diff -b -u -2 -r1.234 -r1.235
--- SendMessageCC.cpp 31 Aug 2006 23:45:33 -0000 1.234
+++ SendMessageCC.cpp 4 Sep 2006 23:15:37 -0000 1.235
@@ -51,5 +51,5 @@
// defines SendMessage under Windows
#include <wx/fontmap.h> // for GetEncodingName()
-#if defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WINE__)
# undef SendMessage
#endif
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
