[evolution-patches] Declaration fixes in camel providers for GCC 4



The attached fixes some trivial errors under GCC 4:
camel-imap-store-summary.c: In function
'camel_imap_store_summary_namespace_set':
camel-imap-store-summary.c:392: error: invalid storage class for
function 'namespace_clear'
(and a similar one in the groupwise provider).  Is the code there valid
C?  The fix is trivial.

Dave

--- evolution-data-server-1.1.6/camel/providers/imap/camel-imap-store-summary.c.fix-namespace-clear	2004-12-02 03:03:30.000000000 -0500
+++ evolution-data-server-1.1.6/camel/providers/imap/camel-imap-store-summary.c	2005-03-01 15:06:24.000000000 -0500
@@ -48,6 +48,8 @@
 
 #define _PRIVATE(o) (((CamelImapStoreSummary *)(o))->priv)
 
+static void namespace_clear(CamelStoreSummary *s);
+
 static int summary_header_load(CamelStoreSummary *, FILE *);
 static int summary_header_save(CamelStoreSummary *, FILE *);
 
@@ -389,8 +391,6 @@
 
 void camel_imap_store_summary_namespace_set(CamelImapStoreSummary *s, CamelImapStoreNamespace *ns)
 {
-	static void namespace_clear(CamelStoreSummary *s);
-
 	d(printf("Setting namesapce to '%s' '%c' -> '%s'\n", ns->full_name, ns->sep, ns->path));
 	namespace_clear((CamelStoreSummary *)s);
 	s->namespace = ns;
--- evolution-data-server-1.1.6/camel/providers/groupwise/camel-groupwise-store-summary.c.fix-namespace-clear	2005-03-01 15:44:49.794557736 -0500
+++ evolution-data-server-1.1.6/camel/providers/groupwise/camel-groupwise-store-summary.c	2005-03-01 15:45:02.756703653 -0500
@@ -47,6 +47,8 @@
 
 #define d(x)
 
+static void namespace_clear(CamelStoreSummary *s);
+
 static int summary_header_load(CamelStoreSummary *, FILE *);
 static int summary_header_save(CamelStoreSummary *, FILE *);
 
@@ -432,8 +434,6 @@
 void 
 camel_groupwise_store_summary_namespace_set(CamelGroupwiseStoreSummary *s, CamelGroupwiseStoreNamespace *ns)
 {
-	static void namespace_clear(CamelStoreSummary *s);
-
 	d(printf("Setting namesapce to '%s' '%c' -> '%s'\n", ns->full_name, ns->sep, ns->path));
 	namespace_clear((CamelStoreSummary *)s);
 	s->namespace = ns;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]