mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Fix 598491: Remove use of guile's deprecated GH interface
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18384 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
5f7d71dbdc
commit
9d61ff898a
@ -88,9 +88,8 @@ AC_DEFUN([GNOME_CHECK_GUILE],
|
||||
AC_MSG_CHECKING(whether guile works)
|
||||
AC_TRY_LINK([
|
||||
#include <libguile.h>
|
||||
#include <guile/gh.h>
|
||||
],[
|
||||
gh_eval_str("(newline)");
|
||||
scm_c_eval_string("(newline)");
|
||||
scm_boot_guile(0,NULL,NULL,NULL);
|
||||
],[
|
||||
ac_cv_guile_found=yes
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <guile/gh.h>
|
||||
#include <libguile.h>
|
||||
#include <ctype.h>
|
||||
#include <locale.h>
|
||||
#include <string.h>
|
||||
@ -342,7 +342,10 @@ func_op(const char *fname, int argc, void **argv)
|
||||
|
||||
realFnName = g_string_sized_new( strlen(fname) + 5 );
|
||||
g_string_printf( realFnName, "gnc:%s", fname );
|
||||
scmFn = gh_eval_str_with_standard_handler( realFnName->str );
|
||||
// scmFn = gh_eval_str_with_standard_handler( realFnName->str );
|
||||
scmFn = scm_internal_catch(SCM_BOOL_T,
|
||||
(scm_catch_body_t)scm_c_eval_string, realFnName->str,
|
||||
scm_handle_by_message_noexit, NULL);
|
||||
g_string_free( realFnName, TRUE );
|
||||
if (!SCM_PROCEDUREP(scmFn)) {
|
||||
/* FIXME: handle errors correctly. */
|
||||
|
@ -45,7 +45,7 @@
|
||||
#include "gncVendor.h"
|
||||
#include "gncAddress.h"
|
||||
#include "gncBillTerm.h"
|
||||
#include <guile/gh.h>
|
||||
#include <libguile.h>
|
||||
%}
|
||||
|
||||
%include <timespec.i>
|
||||
|
Loading…
Reference in New Issue
Block a user