[Commits] inc.c 1.149.2.111 1.149.2.112 mbox.c 1.28.2.53 1.28.2.54

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv13676/src

Modified Files:
      Tag: gtk2
	inc.c mbox.c 
Log Message:
2012-10-10 [colin]	3.8.1cvs90

	* src/inc.c
	* src/mbox.c
	* src/common/smtp.c
	* src/common/smtp.h
		Fix bug #2639, "The MSGBUFSIZE definition collides with a definition of OpenBSD"
		Patch by "madroach"

Index: inc.c
===================================================================
RCS file: /home/claws-mail/claws/src/inc.c,v
retrieving revision 1.149.2.111
retrieving revision 1.149.2.112
diff -u -d -r1.149.2.111 -r1.149.2.112
--- inc.c	19 Sep 2012 09:45:32 -0000	1.149.2.111
+++ inc.c	10 Oct 2012 08:12:10 -0000	1.149.2.112
@@ -89,7 +89,7 @@
 static GdkPixbuf *errorpix;
 static GdkPixbuf *okpix;
 
-#define MSGBUFSIZE	8192
+#define MESSAGEBUFSIZE	8192
 
 static void inc_update_stats(gint new_msgs);
 static void inc_finished		(MainWindow		*mainwin,
@@ -968,7 +968,7 @@
 static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
 					     IncSession *inc_session)
 {
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 	Pop3Session *pop3_session = POP3_SESSION(inc_session->session);
 	gchar *total_size_str;
 	gint cur_total;

Index: mbox.c
===================================================================
RCS file: /home/claws-mail/claws/src/mbox.c,v
retrieving revision 1.28.2.53
retrieving revision 1.28.2.54
diff -u -d -r1.28.2.53 -r1.28.2.54
--- mbox.c	12 Sep 2012 09:23:12 -0000	1.28.2.53
+++ mbox.c	10 Oct 2012 08:12:10 -0000	1.28.2.54
@@ -53,7 +53,7 @@
 #include "alertpanel.h"
 #include "statusbar.h"
 
-#define MSGBUFSIZE	8192
+#define MESSAGEBUFSIZE	8192
 
 #ifdef HAVE_FGETS_UNLOCKED
 #define SC_FGETS fgets_unlocked
@@ -83,7 +83,7 @@
 /* return values: -1 error, >=0 number of msgs added */
 {
 	FILE *mbox_fp;
-	gchar buf[MSGBUFSIZE];
+	gchar buf[MESSAGEBUFSIZE];
 	gchar *tmp_file;
 	gint msgs = 0;
 	gint lines;