summaryrefslogtreecommitdiff
path: root/libmu_scm
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2002-09-10 12:03:42 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2002-09-10 12:03:42 +0000
commit19be4447de8711a0480455d2bd5f902813b4db10 (patch)
treea6cbedf81dcd5e257f57346308946f2127ce31a0 /libmu_scm
parent59e7b2d4cd24c1a202729612fca35113e419e1e6 (diff)
downloadmailutils-19be4447de8711a0480455d2bd5f902813b4db10.tar.gz
mailutils-19be4447de8711a0480455d2bd5f902813b4db10.tar.bz2
Upgrade to guile 1.6.0
Diffstat (limited to 'libmu_scm')
-rw-r--r--libmu_scm/mu_address.c8
-rw-r--r--libmu_scm/mu_body.c2
-rw-r--r--libmu_scm/mu_guimb.c6
-rw-r--r--libmu_scm/mu_logger.c12
-rw-r--r--libmu_scm/mu_mailbox.c6
-rw-r--r--libmu_scm/mu_message.c18
-rw-r--r--libmu_scm/mu_scm.c34
-rw-r--r--libmu_scm/mu_scm.h18
8 files changed, 66 insertions, 38 deletions
diff --git a/libmu_scm/mu_address.c b/libmu_scm/mu_address.c
index 0f1701e85..46a35316f 100644
--- a/libmu_scm/mu_address.c
+++ b/libmu_scm/mu_address.c
@@ -43,3 +43,3 @@ _get_address_part (const char *func_name, address_get_fp fun,
- str = SCM_CHARS (ADDRESS);
+ str = SCM_STRING_CHARS (ADDRESS);
length = strlen (str);
@@ -48,3 +48,3 @@ _get_address_part (const char *func_name, address_get_fp fun,
- if (address_create (&addr, SCM_CHARS (ADDRESS)))
+ if (address_create (&addr, SCM_STRING_CHARS (ADDRESS)))
return SCM_BOOL_F;
@@ -128,3 +128,3 @@ SCM_DEFINE (mu_address_get_count, "mu-address-get-count", 1, 0, 0,
- if (address_create (&addr, SCM_CHARS (ADDRESS)))
+ if (address_create (&addr, SCM_STRING_CHARS (ADDRESS)))
return SCM_MAKINUM(0);
@@ -152,3 +152,3 @@ SCM_DEFINE (mu_username_to_email, "mu-username->email", 0, 1, 0,
NAME, SCM_ARG1, FUNC_NAME);
- name = SCM_CHARS (NAME);
+ name = SCM_STRING_CHARS (NAME);
}
diff --git a/libmu_scm/mu_body.c b/libmu_scm/mu_body.c
index 5faab6916..18ad85354 100644
--- a/libmu_scm/mu_body.c
+++ b/libmu_scm/mu_body.c
@@ -176,3 +176,3 @@ SCM_DEFINE (mu_body_write, "mu-body-write", 2, 0, 0,
- ptr = SCM_CHARS (TEXT);
+ ptr = SCM_STRING_CHARS (TEXT);
len = strlen (ptr);
diff --git a/libmu_scm/mu_guimb.c b/libmu_scm/mu_guimb.c
index 5b1e40814..888a37d5f 100644
--- a/libmu_scm/mu_guimb.c
+++ b/libmu_scm/mu_guimb.c
@@ -58,4 +58,3 @@ _scheme_main (void *closure, int argc, char **argv)
_current_mailbox = mu_scm_mailbox_create (param->mbox);
- scm_loc = SCM_CDRLOC (scm_sysintern ("current-mailbox", SCM_EOL));
- *scm_loc = _current_mailbox;
+ mu_set_variable ("current-mailbox", _current_mailbox);
@@ -63,4 +62,3 @@ _scheme_main (void *closure, int argc, char **argv)
scm_makfrom0str (param->user_name) : SCM_BOOL_F;
- scm_loc = SCM_CDRLOC (scm_sysintern ("user-name", SCM_EOL));
- *scm_loc = _user_name;
+ mu_set_variable ("user-name", _user_name);
diff --git a/libmu_scm/mu_logger.c b/libmu_scm/mu_logger.c
index d42227fec..85d151aaf 100644
--- a/libmu_scm/mu_logger.c
+++ b/libmu_scm/mu_logger.c
@@ -35,3 +35,3 @@ SCM_DEFINE(mu_openlog, "mu-openlog", 3, 0, 0,
IDENT, SCM_ARG1, FUNC_NAME);
- ident = SCM_CHARS (IDENT);
+ ident = SCM_STRING_CHARS (IDENT);
}
@@ -41,3 +41,3 @@ SCM_DEFINE(mu_openlog, "mu-openlog", 3, 0, 0,
else if (SCM_BIGP (OPTION))
- option = (int) scm_big2dbl (OPTION);
+ option = (int) scm_i_big2dbl (OPTION);
else
@@ -48,3 +48,3 @@ SCM_DEFINE(mu_openlog, "mu-openlog", 3, 0, 0,
else if (SCM_BIGP (FACILITY))
- facility = (int) scm_big2dbl (FACILITY);
+ facility = (int) scm_i_big2dbl (FACILITY);
else
@@ -69,3 +69,3 @@ SCM_DEFINE (mu_logger, "mu-logger", 2, 0, 0,
else if (SCM_BIGP (PRIO))
- prio = (int) scm_big2dbl (PRIO);
+ prio = (int) scm_i_big2dbl (PRIO);
else
@@ -75,3 +75,3 @@ SCM_DEFINE (mu_logger, "mu-logger", 2, 0, 0,
TEXT, SCM_ARG2, FUNC_NAME);
- syslog (prio, "%s", SCM_CHARS (TEXT));
+ syslog (prio, "%s", SCM_STRING_CHARS (TEXT));
return SCM_UNSPECIFIED;
@@ -128,3 +128,3 @@ mu_scm_logger_init ()
for (i = 0; i < sizeof (syslog_kw)/sizeof (syslog_kw[0]); i++)
- scm_sysintern (syslog_kw[i].name, SCM_MAKINUM (syslog_kw[i].facility));
+ scm_c_define (syslog_kw[i].name, SCM_MAKINUM (syslog_kw[i].facility));
#include <mu_logger.x>
diff --git a/libmu_scm/mu_mailbox.c b/libmu_scm/mu_mailbox.c
index 301ab7140..f6b2baa5b 100644
--- a/libmu_scm/mu_mailbox.c
+++ b/libmu_scm/mu_mailbox.c
@@ -119,3 +119,3 @@ SCM_DEFINE (mu_mailbox_open, "mu-mailbox-open", 2, 0, 0,
- for (mode_str = SCM_CHARS (MODE); *mode_str; mode_str++)
+ for (mode_str = SCM_STRING_CHARS (MODE); *mode_str; mode_str++)
switch (*mode_str)
@@ -139,3 +139,3 @@ SCM_DEFINE (mu_mailbox_open, "mu-mailbox-open", 2, 0, 0,
- if (mailbox_create_default (&mbox, SCM_CHARS (URL)) != 0)
+ if (mailbox_create_default (&mbox, SCM_STRING_CHARS (URL)) != 0)
return SCM_BOOL_F;
@@ -199,3 +199,3 @@ SCM_DEFINE (mu_mailbox_get_port, "mu-mailbox-get-port", 2, 0, 0,
return mu_port_make_from_stream (MBOX, stream,
- scm_mode_bits (SCM_CHARS (MODE)));
+ scm_mode_bits (SCM_STRING_CHARS (MODE)));
}
diff --git a/libmu_scm/mu_message.c b/libmu_scm/mu_message.c
index ac9efd9a6..347582778 100644
--- a/libmu_scm/mu_message.c
+++ b/libmu_scm/mu_message.c
@@ -274,3 +274,3 @@ SCM_DEFINE (mu_message_set_header, "mu-message-set-header", 3, 1, 0,
message_get_header (msg, &hdr);
- header_set_value (hdr, SCM_CHARS (HEADER), strdup (SCM_CHARS (VALUE)),
+ header_set_value (hdr, SCM_STRING_CHARS (HEADER), strdup (SCM_STRING_CHARS (VALUE)),
replace);
@@ -344,3 +344,3 @@ SCM_DEFINE (mu_message_get_header, "mu-message-get-header", 2, 0, 0,
HEADER, SCM_ARG2, FUNC_NAME);
- header_string = SCM_CHARS (HEADER);
+ header_string = SCM_STRING_CHARS (HEADER);
message_get_header (msg, &hdr);
@@ -362,3 +362,3 @@ string_sloppy_member (SCM lst, char *name)
if ((SCM_NIMP (car) && SCM_STRINGP (car))
- && strcasecmp (SCM_CHARS (car), name) == 0)
+ && strcasecmp (SCM_STRING_CHARS (car), name) == 0)
return 1;
@@ -465,3 +465,3 @@ SCM_DEFINE (mu_message_set_header_fields, "mu-message-set-header-fields", 2, 1,
cdr, SCM_ARGn, FUNC_NAME);
- header_set_value (hdr, SCM_CHARS (car), SCM_CHARS (cdr), replace);
+ header_set_value (hdr, SCM_STRING_CHARS (car), SCM_STRING_CHARS (cdr), replace);
}
@@ -712,3 +712,3 @@ SCM_DEFINE (mu_message_get_port, "mu-message-get-port", 2, 1, 0,
return mu_port_make_from_stream (MESG, stream,
- scm_mode_bits (SCM_CHARS (MODE)));
+ scm_mode_bits (SCM_STRING_CHARS (MODE)));
}
@@ -812,6 +812,6 @@ SCM_DEFINE (mu_message_send, "mu-message-send", 1, 3, 0,
MAILER, SCM_ARG2, FUNC_NAME);
- mailer_name = SCM_CHARS (MAILER);
+ mailer_name = SCM_STRING_CHARS (MAILER);
}
else
- mailer_name = SCM_CHARS(_mu_scm_mailer);
+ mailer_name = SCM_STRING_CHARS(_mu_scm_mailer);
@@ -820,3 +820,3 @@ SCM_DEFINE (mu_message_send, "mu-message-send", 1, 3, 0,
SCM_ASSERT (SCM_NIMP (FROM) && SCM_STRINGP (FROM)
- && address_create (&from, SCM_CHARS (FROM)) == 0,
+ && address_create (&from, SCM_STRING_CHARS (FROM)) == 0,
FROM, SCM_ARG3, FUNC_NAME);
@@ -827,3 +827,3 @@ SCM_DEFINE (mu_message_send, "mu-message-send", 1, 3, 0,
SCM_ASSERT (SCM_NIMP (TO) && SCM_STRINGP (TO)
- && address_create (&to, SCM_CHARS (TO)) == 0,
+ && address_create (&to, SCM_STRING_CHARS (TO)) == 0,
TO, SCM_ARG4, FUNC_NAME);
diff --git a/libmu_scm/mu_scm.c b/libmu_scm/mu_scm.c
index 0fe68e12a..ab69623bb 100644
--- a/libmu_scm/mu_scm.c
+++ b/libmu_scm/mu_scm.c
@@ -23,4 +23,5 @@
-SCM
+SCM
scm_makenum (unsigned long val)
+#ifndef HAVE_SCM_LONG2NUM
{
@@ -35,2 +36,18 @@ scm_makenum (unsigned long val)
}
+#else
+{
+ return scm_long2num (val);
+}
+#endif
+
+void
+mu_set_variable (const char *name, SCM value)
+{
+#if GUILE_VERSION == 14
+ scm_c_define (name, value); /*FIXME*/
+#else
+ scm_c_define (name, value);
+#endif
+}
+
@@ -62,3 +79,2 @@ mu_scm_init ()
{
- SCM *scm_loc;
char *defmailer;
@@ -68,16 +84,12 @@ mu_scm_init ()
_mu_scm_mailer = scm_makfrom0str (defmailer);
- scm_loc = SCM_CDRLOC (scm_sysintern ("mu-mailer", SCM_EOL));
- *scm_loc = _mu_scm_mailer;
+ mu_set_variable ("mu-mailer", _mu_scm_mailer);
_mu_scm_debug = scm_makenum(0);
- scm_loc = SCM_CDRLOC (scm_sysintern ("mu-debug", SCM_EOL));
- *scm_loc = _mu_scm_debug;
+ mu_set_variable ("mu-debug", _mu_scm_debug);
_mu_scm_package = scm_makfrom0str (PACKAGE);
- scm_loc = SCM_CDRLOC (scm_sysintern ("mu-package", SCM_EOL));
- *scm_loc = _mu_scm_package;
+ mu_set_variable ("mu-package", _mu_scm_package);
_mu_scm_version = scm_makfrom0str (VERSION);
- scm_loc = SCM_CDRLOC (scm_sysintern ("mu-version", SCM_EOL));
- *scm_loc = _mu_scm_version;
+ mu_set_variable ("mu-version", _mu_scm_version);
@@ -85,3 +97,3 @@ mu_scm_init ()
for (i = 0; attr_kw[i].name; i++)
- scm_sysintern(attr_kw[i].name, SCM_MAKINUM(attr_kw[i].value));
+ scm_c_define(attr_kw[i].name, SCM_MAKINUM(attr_kw[i].value));
diff --git a/libmu_scm/mu_scm.h b/libmu_scm/mu_scm.h
index 49fb74994..ee580c0e8 100644
--- a/libmu_scm/mu_scm.h
+++ b/libmu_scm/mu_scm.h
@@ -45,2 +45,19 @@
+#if GUILE_VERSION == 14
+
+# define SCM_STRING_CHARS SCM_CHARS
+# 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);
+
+#endif
+
typedef struct
@@ -62,2 +79,3 @@ 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));

Return to:

Send suggestions and report system problems to the System administrator.