diff --git a/src/backend/xml/test/test-file-stuff.h b/src/backend/xml/test/test-file-stuff.h index c2d8d39cd7..45786939a4 100644 --- a/src/backend/xml/test/test-file-stuff.h +++ b/src/backend/xml/test/test-file-stuff.h @@ -16,7 +16,10 @@ extern "C" #include #include +#ifndef __KVP_FRAME typedef struct KvpFrameImpl KvpFrame; +#define __KVP_FRAME +#endif void write_dom_node_to_file(xmlNodePtr node, int fd); diff --git a/src/engine/test-core/test-engine-stuff.h b/src/engine/test-core/test-engine-stuff.h index f5ab980e45..c2a0019648 100644 --- a/src/engine/test-core/test-engine-stuff.h +++ b/src/engine/test-core/test-engine-stuff.h @@ -17,8 +17,14 @@ extern "C" #include "gnc-pricedb.h" #include "SchedXaction.h" +#ifndef __KVP_VALUE typedef struct KvpValueImpl KvpValue; +#define __KVP_VALUE +#endif +#ifndef __KVP_FRAME typedef struct KvpFrameImpl KvpFrame; +#define __KVP_FRAME +#endif Timespec* get_random_timespec(void); void random_timespec_zero_nsec (gboolean zero_nsec); void random_timespec_usec_resolution (gboolean usec_resolution); diff --git a/src/libqof/qof/qofbook.h b/src/libqof/qof/qofbook.h index 50750ce907..d98c08f38d 100644 --- a/src/libqof/qof/qofbook.h +++ b/src/libqof/qof/qofbook.h @@ -49,7 +49,10 @@ extern "C" #ifndef SWIG typedef struct _QofBookClass QofBookClass; +#ifndef __KVP_VALUE typedef struct KvpValueImpl KvpValue; +#define __KVP_VALUE +#endif #include "qofid.h" #include "qofinstance.h" diff --git a/src/libqof/qof/qofinstance.h b/src/libqof/qof/qofinstance.h index df4f38292e..1b2e559445 100644 --- a/src/libqof/qof/qofinstance.h +++ b/src/libqof/qof/qofinstance.h @@ -60,8 +60,10 @@ typedef struct _QofBook QofBook; (G_TYPE_CHECK_CLASS_TYPE ((k), QOF_TYPE_INSTANCE)) #define QOF_INSTANCE_GET_CLASS(o) \ (G_TYPE_INSTANCE_GET_CLASS ((o), QOF_TYPE_INSTANCE, QofInstanceClass)) - +#ifndef __KVP_FRAME typedef struct KvpFrameImpl KvpFrame; +#define __KVP_FRAME +#endif struct QofInstance_s {