From e1ffe7ed975b20ef6896b3cd41b72199a8aac214 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 10 Jan 2001 20:19:45 +0000 Subject: New header to prevent recursive #include problems * providers/imap/camel-imap-types.h: New header to prevent recursive #include problems * providers/imap/*.h: Replace some #includes with #include "camel-imap-types.h", remove typedefs that were moved to camel-imap-types.h * providers/imap/*.c: Add #includes to make up for #includes removed from .h files * providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Add camel-imap-types.h svn path=/trunk/; revision=7367 --- camel/ChangeLog | 15 +++++++++++++++ camel/providers/imap/Makefile.am | 1 + camel/providers/imap/camel-imap-command.c | 1 + camel/providers/imap/camel-imap-command.h | 7 ++++--- camel/providers/imap/camel-imap-folder.h | 5 +++-- camel/providers/imap/camel-imap-search.c | 1 + camel/providers/imap/camel-imap-search.h | 1 - camel/providers/imap/camel-imap-store.h | 5 +++-- camel/providers/imap/camel-imap-summary.h | 2 +- 9 files changed, 29 insertions(+), 9 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index 76f4d130fb..607d95e753 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,18 @@ +2001-01-10 Dan Winship + + * providers/imap/camel-imap-types.h: New header to prevent + recursive #include problems + + * providers/imap/*.h: Replace some #includes with #include + "camel-imap-types.h", remove typedefs that were moved to + camel-imap-types.h + + * providers/imap/*.c: Add #includes to make up for #includes + removed from .h files + + * providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Add + camel-imap-types.h + 2001-01-10 Dan Winship * camel-store.c (camel_store_sync): New class function, parallel diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am index 77cf3059e2..aa34eac652 100644 --- a/camel/providers/imap/Makefile.am +++ b/camel/providers/imap/Makefile.am @@ -37,6 +37,7 @@ libcamelimapinclude_HEADERS = \ camel-imap-search.h \ camel-imap-store.h \ camel-imap-summary.h \ + camel-imap-types.h \ camel-imap-utils.h libcamelimap_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0 diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c index df27fba0fb..b242dd122c 100644 --- a/camel/providers/imap/camel-imap-command.c +++ b/camel/providers/imap/camel-imap-command.c @@ -34,6 +34,7 @@ #include "camel-imap-command.h" #include "camel-imap-utils.h" #include "camel-imap-folder.h" +#include "camel-imap-store.h" #include static char *imap_read_untagged (CamelImapStore *store, char *line, diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h index 38e290c379..a7d3c3eae9 100644 --- a/camel/providers/imap/camel-imap-command.h +++ b/camel/providers/imap/camel-imap-command.h @@ -33,12 +33,13 @@ extern "C" { #pragma } #endif /* __cplusplus }*/ -#include "camel-imap-store.h" +#include "camel-imap-types.h" +#include -typedef struct { +struct _CamelImapResponse { GPtrArray *untagged; char *status; -} CamelImapResponse; +}; CamelImapResponse *camel_imap_command (CamelImapStore *store, CamelFolder *folder, diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h index cf237f155e..6863782c8a 100644 --- a/camel/providers/imap/camel-imap-folder.h +++ b/camel/providers/imap/camel-imap-folder.h @@ -33,6 +33,7 @@ extern "C" { #pragma } #endif /* __cplusplus }*/ +#include "camel-imap-types.h" #include "camel-folder.h" #include @@ -41,13 +42,13 @@ extern "C" { #define CAMEL_IMAP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolderClass)) #define CAMEL_IS_IMAP_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_FOLDER_TYPE)) -typedef struct { +struct _CamelImapFolder { CamelFolder parent_object; struct _CamelImapFolderPrivate *priv; CamelFolderSearch *search; -} CamelImapFolder; +}; typedef struct { diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c index 09c21a5c47..97ed02b6c2 100644 --- a/camel/providers/imap/camel-imap-search.c +++ b/camel/providers/imap/camel-imap-search.c @@ -30,6 +30,7 @@ #include "camel-imap-command.h" #include "camel-imap-folder.h" +#include "camel-imap-store.h" #include "camel-imap-search.h" #include "camel-imap-private.h" diff --git a/camel/providers/imap/camel-imap-search.h b/camel/providers/imap/camel-imap-search.h index c588459577..97fd6cd6c4 100644 --- a/camel/providers/imap/camel-imap-search.h +++ b/camel/providers/imap/camel-imap-search.h @@ -34,7 +34,6 @@ #define CAMEL_IS_IMAP_SEARCH(obj) CAMEL_CHECK_TYPE (obj, camel_imap_search_get_type ()) typedef struct _CamelImapSearchClass CamelImapSearchClass; -typedef struct _CamelImapSearch CamelImapSearch; struct _CamelImapSearch { CamelFolderSearch parent; diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h index 2e944d12d2..a24723b657 100644 --- a/camel/providers/imap/camel-imap-store.h +++ b/camel/providers/imap/camel-imap-store.h @@ -32,6 +32,7 @@ extern "C" { #pragma } #endif /* __cplusplus }*/ +#include "camel-imap-types.h" #include "camel-remote-store.h" #define CAMEL_IMAP_STORE_TYPE (camel_imap_store_get_type ()) @@ -54,7 +55,7 @@ typedef enum { #define IMAP_CAPABILITY_UIDPLUS (1 << 6) #define IMAP_CAPABILITY_LITERALPLUS (1 << 7) -typedef struct { +struct _CamelImapStore { CamelRemoteStore parent_object; struct _CamelImapStorePrivate *priv; @@ -71,7 +72,7 @@ typedef struct { GHashTable *subscribed_folders; gboolean useful_lsub; -} CamelImapStore; +}; typedef struct { diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h index cd3556b23b..e3ee2ff13b 100644 --- a/camel/providers/imap/camel-imap-summary.h +++ b/camel/providers/imap/camel-imap-summary.h @@ -24,6 +24,7 @@ #ifndef _CAMEL_IMAP_SUMMARY_H #define _CAMEL_IMAP_SUMMARY_H +#include "camel-imap-types.h" #include #include @@ -31,7 +32,6 @@ #define CAMEL_IMAP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap_summary_get_type (), CamelImapSummaryClass) #define CAMEL_IS_IMAP_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_imap_summary_get_type ()) -typedef struct _CamelImapSummary CamelImapSummary; typedef struct _CamelImapSummaryClass CamelImapSummaryClass; typedef struct _CamelImapMessageContentInfo { -- cgit v1.2.3