Re: [Mailsync-list] new CVS snapshot

[Michael 'h. K. <mai...@zz...>]

On Mon, Jun 14, 2004 at 11:23:55AM +0200, Tomas Pospisek wrote:
> Hello everybody,
> 
> I've released a new CVS snapshot, which should fix both mh (tested a
> bit) and mutt (messages are not shown as new - tested a bit) problems.
> 
> Please test. This is a release candidate (knocking on wood like a
> woodpecker).
> 
> Thanks a greets for all the bugreporters and all those that are keeping on
> bugging me about their pet mh store not working ;-)

So far so good. Thanks. Will report more if problems arise. I liked the
idea of the fix ;-)

And, since the part of the fix made it into the CVS, maybe you will want
to patch the rest:

Maybe it's better to move #include <c-client.h> to a separate header...

Love,
H

Index: src/c-client_callbacks.cc
===================================================================
RCS file: /cvsroot/mailsync/mailsync/src/c-client_callbacks.cc,v
retrieving revision 1.2
diff -u -r1.2 c-client_callbacks.cc
--- src/c-client_callbacks.cc	20 Apr 2003 09:52:00 -0000	1.2
+++ src/c-client_callbacks.cc	14 Jun 2004 11:08:40 -0000
@@ -14,6 +14,8 @@
 
 #include <stdio.h>      // required by c-client.h
 #include <c-client.h>
+#undef max
+#undef min
 
 #include "options.h"
 #include "types.h"
Index: src/channel.cc
===================================================================
RCS file: /cvsroot/mailsync/mailsync/src/channel.cc,v
retrieving revision 1.13
diff -u -r1.13 channel.cc
--- src/channel.cc	13 Jun 2004 20:55:04 -0000	1.13
+++ src/channel.cc	14 Jun 2004 11:08:41 -0000
@@ -4,6 +4,8 @@
 #include "types.h"
 #include "mail_handling.h"
 #include <c-client.h>
+#undef max
+#undef min
 #include "msgstring.h"
 #include <flstring.h>
 #include "msgid.h"
Index: src/configuration.cc
===================================================================
RCS file: /cvsroot/mailsync/mailsync/src/configuration.cc,v
retrieving revision 1.4
diff -u -r1.4 configuration.cc
--- src/configuration.cc	22 Apr 2003 13:23:08 -0000	1.4
+++ src/configuration.cc	14 Jun 2004 11:08:41 -0000
@@ -4,6 +4,8 @@
 #include <string>
 #include <sys/stat.h>           // Stat()
 #include "c-client.h"           // for MAILTMPLEN
+#undef max
+#undef min
 #include "configuration.h"
 #include "options.h"
 #include "store.h"
Index: src/mail_handling.cc
===================================================================
RCS file: /cvsroot/mailsync/mailsync/src/mail_handling.cc,v
retrieving revision 1.4
diff -u -r1.4 mail_handling.cc
--- src/mail_handling.cc	27 Mar 2003 18:11:34 -0000	1.4
+++ src/mail_handling.cc	14 Jun 2004 11:08:41 -0000
@@ -1,6 +1,8 @@
 #include <stdio.h>  // required by c-client.h
 #include <ctype.h>
 #include "c-client.h"
+#undef max
+#undef min
 #include "options.h"
 #include "types.h"
 #include "msgstring.h"
Index: src/mail_handling.h
===================================================================
RCS file: /cvsroot/mailsync/mailsync/src/mail_handling.h,v
retrieving revision 1.2
diff -u -r1.2 mail_handling.h
--- src/mail_handling.h	23 Mar 2003 21:06:45 -0000	1.2
+++ src/mail_handling.h	14 Jun 2004 11:08:41 -0000
@@ -1,5 +1,7 @@
 #ifndef __MAILSYNC_MAILHANDLING__
 #include "c-client.h"
+#undef max
+#undef min
 
 //------------------------- Helper functions -----------------------------
 
Index: src/msgid.cc
===================================================================
RCS file: /cvsroot/mailsync/mailsync/src/msgid.cc,v
retrieving revision 1.8
diff -u -r1.8 msgid.cc
--- src/msgid.cc	2 Jun 2004 14:27:14 -0000	1.8
+++ src/msgid.cc	14 Jun 2004 11:08:41 -0000
@@ -5,6 +5,8 @@
 #include "msgid.h"
 #include "options.h"
 #include <c-client.h>
+#undef max
+#undef min
 #include <cassert>
 
 //////////////////////////////////////////////////////////////////////////
Index: src/msgid.h
===================================================================
RCS file: /cvsroot/mailsync/mailsync/src/msgid.h,v
retrieving revision 1.2
diff -u -r1.2 msgid.h
--- src/msgid.h	1 Jun 2004 09:34:36 -0000	1.2
+++ src/msgid.h	14 Jun 2004 11:08:41 -0000
@@ -2,6 +2,8 @@
 
 #include <string>
 #include <c-client.h>
+#undef max
+#undef min
 #include "options.h"
 
 using namespace std;
Index: src/msgstring.c
===================================================================
RCS file: /cvsroot/mailsync/mailsync/src/msgstring.c,v
retrieving revision 1.3
diff -u -r1.3 msgstring.c
--- src/msgstring.c	20 Apr 2003 09:50:58 -0000	1.3
+++ src/msgstring.c	14 Jun 2004 11:08:41 -0000
@@ -4,6 +4,8 @@
 
 #include <stdio.h>      // required by c-client.h
 #include <c-client.h>
+#undef max
+#undef min
 #include "msgstring.h"
 
 STRINGDRIVER msg_string = {
Index: src/store.h
===================================================================
RCS file: /cvsroot/mailsync/mailsync/src/store.h,v
retrieving revision 1.7
diff -u -r1.7 store.h
--- src/store.h	14 Jun 2004 08:57:08 -0000	1.7
+++ src/store.h	14 Jun 2004 11:08:41 -0000
@@ -5,6 +5,8 @@
 #include <map>
 #include <set>
 #include <c-client.h>
+#undef max
+#undef min
 #include "types.h"
 #include "msgid.h"
 
Index: src/types.h
===================================================================
RCS file: /cvsroot/mailsync/mailsync/src/types.h,v
retrieving revision 1.6
diff -u -r1.6 types.h
--- src/types.h	23 Mar 2003 21:06:45 -0000	1.6
+++ src/types.h	14 Jun 2004 11:08:41 -0000
@@ -5,6 +5,8 @@
 #include <map>
 #include <set>
 #include <c-client.h>
+#undef max
+#undef min
 #include "msgid.h"
 
 using namespace std;