Hello Matthew,

On Tue, Mar 31, 2009 at 11:09:26PM +0200, Philipp Matthias Hahn wrote:
> Hello Matthew,
> 
> I just received this bug-report for Debian. Please keep
> 521...@bugs.debian.org in the cc: for tracking.

I created the following patch which should fix the problem; at least it
does for me.

--- ike-2.1.4+dfsg.orig/source/iked/iked.h
+++ ike-2.1.4+dfsg/source/iked/iked.h
@@ -79,7 +79,6 @@
 #  include <sys/linker.h>
 # endif
 # include "compat/winstring.h"
-# include "conf.parse.hpp"
 # ifndef SOCKET
 #  define SOCKET int
 # endif
@@ -105,6 +104,21 @@
 #include "xauth.h"
 #include "xconf.h"
 
+/* There is a circular dependency:
+ * - conf.parser.hpp needs BDATA from libidb.h
+ * - conf.parser.hpp needs IKED from iked.h
+ * - iked.h includes conf.parser.hpp at the top
+ * - iked.h declares IKED near the end
+ * Solution:
+ * - libidb.h is included above
+ * - give forward declaration for IKED
+ * - now include conf.parser.hpp
+ */
+#ifdef UNIX
+typedef class _IKED IKED;
+# include "conf.parse.hpp"
+#endif
+
 #ifdef OPT_DTP
 #include "libdtp.h"
 #endif

BYtE
Philipp
-- 
Philipp Matthias Hahn <pmh...@debian.org>
 GPG/PGP: 9A540E39 @ keyrings.debian.org



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to