diff options
2 files changed, 7 insertions, 64 deletions
diff --git a/libmu_scm/mu_scm.h b/libmu_scm/mu_scm.h
index f69767c91..7744a3c29 100644
--- a/libmu_scm/mu_scm.h
+++ b/libmu_scm/mu_scm.h
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
#if defined(HAVE_CONFIG_H)
# include <config.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
@@ -40,68 +41,10 @@
#include <mailutils/mailer.h>
#include <mailutils/envelope.h>
#include <mailutils/url.h>
+#include <mailutils/mime.h>
+#include <mailutils/registrar.h>
+#include <mailutils/mu_auth.h>
-#include <libguile.h>
-#if GUILE_VERSION == 14
-# define scm_list_1 SCM_LIST1
-# define scm_list_2 SCM_LIST2
-# define scm_list_3 SCM_LIST3
-# define scm_list_4 SCM_LIST4
-# define scm_list_5 SCM_LIST5
-# define scm_list_n SCM_LISTN
-# define scm_c_define scm_sysintern
-# define scm_primitive_eval_x scm_eval_x
-# define scm_i_big2dbl scm_big2dbl
-extern SCM scm_long2num (long val);
-typedef struct
- int debug_guile;
- mailbox_t mbox;
- char *user_name;
- int (*init) __P((void *data));
- SCM (*catch_body) __P((void *data, mailbox_t mbox));
- SCM (*catch_handler) __P((void *data, SCM tag, SCM throw_args));
- int (*next) __P((void *data, mailbox_t mbox));
- int (*exit) __P((void *data, mailbox_t mbox));
- void *data;
-} guimb_param_t;
-extern SCM _mu_scm_mailer;
-extern SCM _mu_scm_debug;
-extern SCM scm_makenum __P((unsigned long val));
-extern void mu_set_variable (const char *name, SCM value);
-extern void mu_scm_init __P((void));
-extern void mu_scm_mailbox_init __P((void));
-extern SCM mu_scm_mailbox_create __P((mailbox_t mbox));
-extern int mu_scm_is_mailbox __P((SCM scm));
-extern void mu_scm_message_init __P((void));
-extern SCM mu_scm_message_create __P((SCM owner, message_t msg));
-extern int mu_scm_is_message __P((SCM scm));
-extern const message_t mu_scm_message_get __P((SCM MESG));
-extern int mu_scm_is_body __P((SCM scm));
-extern void mu_scm_body_init __P((void));
-extern SCM mu_scm_body_create __P((SCM mesg, body_t body));
-extern void mu_scm_address_init __P((void));
-extern void mu_scm_logger_init __P((void));
-extern void mu_scm_port_init __P((void));
-extern SCM mu_port_make_from_stream __P((SCM msg, stream_t stream, long mode));
-extern void mu_scm_mime_init __P((void));
-extern void mu_scm_message_add_owner __P((SCM MESG, SCM owner));
+#include <mailutils/guile.h>
-extern void mu_process_mailbox __P((int argc, char *argv[], guimb_param_t *param));
-extern void mu_scm_mutil_init __P((void));
diff --git a/mail.local/script.c b/mail.local/script.c
index 17755860b..05c5a97b9 100644
--- a/mail.local/script.c
+++ b/mail.local/script.c
@@ -18,7 +18,7 @@
#include <mail.local.h>
-#include <mu_scm.h>
+#include <mailutils/guile.h>
int debug_guile;

Return to:

Send suggestions and report system problems to the System administrator.