aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog8
-rw-r--r--camel/camel-arg.h4
2 files changed, 10 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 9d1def4a1a..a15e34d14a 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-16 Chris Toshok <toshok@ximian.com>
+
+ * camel-arg.h: remove the outer parens from the expansion of
+ camel_argv_{start,end} since at least on freebsd va_end is
+ #defined to be nothing, so (va_end(..)) causes a syntax error.
+
2002-08-16 Not Zed <NotZed@Ximian.com>
* providers/imap/camel-imap-store.c (get_folders): Fix the logic
@@ -106,6 +112,7 @@
uids table is not null (if finalised before we ran refresh info).
(id_to_fi): Removed. Use id hash table instead, fixed caller.
+>>>>>>> 1.1609
2002-08-05 Jeffrey Stedfast <fejj@ximian.com>
* camel.c (camel_init): Always set a g_atexit handler to
@@ -207,6 +214,7 @@
(email_address_extract): Use is_domain_name_char rather than
is_addr_char for the part after the @.
+>>>>>>> 1.1599
2002-07-30 Jeffrey Stedfast <fejj@ximian.com>
* camel-tcp-stream.c (camel_tcp_address_new): Update the comment.
diff --git a/camel/camel-arg.h b/camel/camel-arg.h
index 7846018149..4c13b25559 100644
--- a/camel/camel-arg.h
+++ b/camel/camel-arg.h
@@ -94,8 +94,8 @@ struct _CamelArgGetV {
CamelArgGet argv[CAMEL_ARGV_MAX];
};
-#define camel_argv_start(tv, last) (va_start((tv)->ap, last))
-#define camel_argv_end(tv) (va_end((tv)->ap))
+#define camel_argv_start(tv, last) va_start((tv)->ap, last)
+#define camel_argv_end(tv) va_end((tv)->ap)
int camel_argv_build(CamelArgV *tv);
int camel_arggetv_build(CamelArgGetV *tv);