aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-12-01 11:07:51 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-12-01 11:07:51 +0800
commit97110c53cd3f87f43a34f640df78bc4ec2201916 (patch)
tree28db45dca9c6d10908d91f9373e87bc5895dedb5
parentc3df6cab992028572466010f433ff387c38de3af (diff)
downloadgsoc2013-evolution-97110c53cd3f87f43a34f640df78bc4ec2201916.tar.gz
gsoc2013-evolution-97110c53cd3f87f43a34f640df78bc4ec2201916.tar.zst
gsoc2013-evolution-97110c53cd3f87f43a34f640df78bc4ec2201916.zip
rename to STREAM_LINE_SIZE so it doesn't override the STREAM_LINE enum.
2004-11-30 Not Zed <NotZed@Ximian.com> * providers/nntp/camel-nntp-stream.c (CAMEL_NNTP_STREAM_LINE): rename to STREAM_LINE_SIZE so it doesn't override the STREAM_LINE enum. Sigh. (camel_nntp_stream_init): fix for above change. svn path=/trunk/; revision=28021
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/providers/nntp/camel-nntp-stream.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 837a3dcfe1..5eb5b00bbd 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-30 Not Zed <NotZed@Ximian.com>
+
+ * providers/nntp/camel-nntp-stream.c (CAMEL_NNTP_STREAM_LINE):
+ rename to STREAM_LINE_SIZE so it doesn't override the STREAM_LINE
+ enum. Sigh.
+ (camel_nntp_stream_init): fix for above change.
+
2004-11-28 S.Çağlar Onur <caglar@uludag.org.tr>
** See bug #69446.
diff --git a/camel/providers/nntp/camel-nntp-stream.c b/camel/providers/nntp/camel-nntp-stream.c
index bc62c0a0c2..244b67acb1 100644
--- a/camel/providers/nntp/camel-nntp-stream.c
+++ b/camel/providers/nntp/camel-nntp-stream.c
@@ -42,7 +42,7 @@ static CamelObjectClass *parent_class = NULL;
#define CS_CLASS(so) CAMEL_NNTP_STREAM_CLASS(CAMEL_OBJECT_GET_CLASS(so))
#define CAMEL_NNTP_STREAM_SIZE (4096)
-#define CAMEL_NNTP_STREAM_LINE (1024) /* maximum line size */
+#define CAMEL_NNTP_STREAM_LINE_SIZE (1024) /* maximum line size */
static int
stream_fill(CamelNNTPStream *is)
@@ -200,8 +200,8 @@ camel_nntp_stream_init(CamelNNTPStream *is, CamelNNTPStreamClass *isclass)
{
/* +1 is room for appending a 0 if we need to for a line */
is->ptr = is->end = is->buf = g_malloc(CAMEL_NNTP_STREAM_SIZE+1);
- is->lineptr = is->linebuf = g_malloc(CAMEL_NNTP_STREAM_LINE+1);
- is->lineend = is->linebuf + CAMEL_NNTP_STREAM_LINE;
+ is->lineptr = is->linebuf = g_malloc(CAMEL_NNTP_STREAM_LINE_SIZE+1);
+ is->lineend = is->linebuf + CAMEL_NNTP_STREAM_LINE_SIZE;
/* init sentinal */
is->ptr[0] = '\n';