Attachment 587614 Details for Bug 704515 – Fixes compilation against guile 2

[patch] Fixes compilation against guile 2

TeXmacs-1.0.7.11-guile2.patch (text/plain), 1.68 KB, created by Jan Synacek on 2012-05-30 07:16:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Synacek

Created: 2012-05-30 07:16:43 UTC

Size: 1.68 KB

patch

obsolete

>--- TeXmacs-1.0.7.11-src/src/Guile/guile.hpp	2011-08-26 23:41:12.000000000 +0200
>+++ TeXmacs-1.0.7.11-src-new/src/Guile/guile.hpp	2012-05-30 08:08:54.641480115 +0200
>@@ -12,6 +12,7 @@
> 
> #ifndef GUILE_HH
> #define GUILE_HH
>+#include <libguile/version.h>
> #include "tm_configure.hpp"
> #ifdef __MINGW32__
> // we redefine some symbols to avoid name clashes with Windows headers (included by Guile)
>@@ -30,7 +31,18 @@
> #define MY_MENU_EVENT MENU_EVENT
> #undef MENU_EVENT
> #endif
>+#if SCM_MAJOR_VERSION < 2
> #include <guile/gh.h>
>+#elif SCM_MAJOR_VERSION == 2
>+#include <libguile.h>
>+#define gh_list scm_list_n
>+#define gh_scm2newstr(a, b) scm_to_locale_string((a))
>+#define FN scm_t_subr
>+inline char * gh_symbol2newstr(SCM sym, size_t *lenp)
>+{
>+	return gh_scm2newstr (scm_symbol_to_string (sym), lenp);
>+}
>+#endif
> #undef STRING
> #undef ERROR
> #undef PATTERN
>@@ -51,7 +62,18 @@
> #undef MY_OUT
> #endif
> #else
>+#if SCM_MAJOR_VERSION < 2
> #include <guile/gh.h>
>+#elif SCM_MAJOR_VERSION == 2
>+#include <libguile.h>
>+#define gh_list scm_list_n
>+#define gh_scm2newstr(a, b) scm_to_locale_string((a))
>+#define FN scm_t_subr
>+inline char * gh_symbol2newstr(SCM sym, size_t *lenp)
>+{
>+	return gh_scm2newstr (scm_symbol_to_string (sym), lenp);
>+}
>+#endif
> #endif
> 
> 
>--- TeXmacs-1.0.7.11-src/src/Guile/Glue/glue.cpp	2011-08-26 23:41:12.000000000 +0200
>+++ TeXmacs-1.0.7.11-src-new/src/Guile/Glue/glue.cpp	2012-05-30 08:07:59.977498310 +0200
>@@ -46,9 +46,13 @@
> #define SCM_ARG9 9
> 
> #ifdef DOTS_OK
>-typedef SCM (*FN)(...);
>+  #if SCM_MAJOR_VERSION < 2
>+  typedef SCM (*FN)(...);
>+  #endif
> #else
>-typedef SCM (*FN)();
>+  #if SCM_MAJOR_VERSION < 2
>+  typedef SCM (*FN)();
>+  #endif
> #endif
> 
> extern void initialize_glue_basic ();

Actions: View | Diff

Attachments on bug 704515: 587614