diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | camel/camel-folder.h | 14 | ||||
| -rw-r--r-- | camel/camel-store.h | 12 |
4 files changed, 16 insertions, 21 deletions
@@ -1,3 +1,12 @@ +1999-04-23 bertrand <Bertrand.Guiheneuf@inria.fr> + + * Makefile.am (SUBDIRS): removed devel-docs + until I come up with a correct Makefile.am + + * camel/camel-store.h: + * camel/camel-folder.h: + correct declarations of structss + 1999-04-22 bertrand <Bertrand.Guiheneuf@inria.fr> * camel/providers/MH/camel-mh-store.c: diff --git a/Makefile.am b/Makefile.am index 8c71d15d79..0958d2dcc2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = po macros camel devel-docs +SUBDIRS = po macros camel diff --git a/camel/camel-folder.h b/camel/camel-folder.h index 96847eb05c..03ed2a6f88 100644 --- a/camel/camel-folder.h +++ b/camel/camel-folder.h @@ -32,6 +32,9 @@ extern "C" { #endif /* __cplusplus }*/ #include <gtk/gtk.h> + +typedef struct _CamelFolder CamelFolder; + #include "camel-store.h" #define CAMEL_FOLDER_TYPE (camel_folder_get_type ()) @@ -50,17 +53,6 @@ typedef enum { FOLDER_OPEN_READ_WRITE /* folder is read/write */ } CamelFolderOpenMode; -#ifndef CAMEL_FOLDER_DEF -#define CAMEL_FOLDER_DEF 1 -typedef struct _CamelFolder CamelFolder; -#endif /* CAMEL_FOLDER_DEF */ - -#ifndef CAMEL_STORE_DEF -#define CAMEL_STORE_DEF 1 -typedef struct _CamelStore CamelStore; -#endif /* CAMEL_STORE_DEF */ - - struct _CamelFolder diff --git a/camel/camel-store.h b/camel/camel-store.h index d2180b89be..90288261e4 100644 --- a/camel/camel-store.h +++ b/camel/camel-store.h @@ -32,6 +32,9 @@ extern "C" { #endif /* __cplusplus }*/ #include <gtk/gtk.h> + +typedef struct _CamelStore CamelStore; + #include "camel-folder.h" #include "camel-service.h" @@ -40,15 +43,6 @@ extern "C" { #define CAMEL_STORE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STORE_TYPE, CamelStoreClass)) #define IS_CAMEL_STORE(o) (GTK_CHECK_TYPE((o), CAMEL_STORE_TYPE)) -#ifndef CAMEL_FOLDER_DEF -#define CAMEL_FOLDER_DEF 1 -typedef struct _CamelFolder CamelFolder; -#endif /* CAMEL_FOLDER_DEF */ - -#ifndef CAMEL_STORE_DEF -#define CAMEL_STORE_DEF 1 -typedef struct _CamelStore CamelStore; -#endif /* CAMEL_STORE_DEF */ struct _CamelStore { |