[PATCH] guile 1.8.x scm_makfromstr takes 3 args

Mike Gran <[email protected]> Fri, 27 May 2011 19:04:20 -0700 (PDT)
Newsgroups gmane.network.serveez.devel
Message-ID <[email protected]>
Hi-

With Guile 1.8.x, the compilation of serveez 'next' head fails due to
a missing parameter.

In Guile 1.8, scm_makfromstr takes 3 args.=A0 The 3rd arg is a dummy arg.

It could be fixed like in the following patch.


diff --git a/src/gi.c b/src/gi.c
index d2b5501..e14a0c4 100644
--- a/src/gi.c
+++ b/src/gi.c
@@ -99,6 +99,9 @@ gi_gc_unprotect (SCM obj)
=A0#if V19
=A0#define mem2scm(len,ptr)=A0 scm_from_locale_stringn (ptr, len)
=A0#define mem02scm(ptr)=A0=A0=A0=A0 scm_from_locale_string (ptr)
+#elif V17
+#define mem2scm(len,ptr)=A0 scm_makfromstr (ptr, len, 0)
+#define mem02scm(ptr)=A0=A0=A0=A0 scm_makfrom0str (ptr)
=A0#elif V15
=A0#define mem2scm(len,ptr)=A0 scm_makfromstr (ptr, len)
=A0#define mem02scm(ptr)=A0=A0=A0=A0 scm_makfrom0str (ptr)


Thanks,

Mike Gran