* async.c, async.h: made async representation a double cell.

diff --git a/libguile/async.c b/libguile/async.c
index b6e7f0c..8b0ee4b 100644 (file)
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 96, 97, 98, 2000 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -282,11 +282,7 @@ SCM_DEFINE (scm_async, "async", 1, 0, 0,
 "")
 #define FUNC_NAME s_scm_async
 {
-  struct scm_async * async
-    = (struct scm_async *) scm_must_malloc (sizeof (*async), FUNC_NAME);
-  async->got_it = 0;
-  async->thunk = thunk;
-  SCM_RETURN_NEWSMOB (scm_tc16_async, async);
+  SCM_RETURN_NEWSMOB2 (scm_tc16_async, 0, thunk);
 }
 #undef FUNC_NAME
 
@@ -299,7 +295,9 @@ SCM_DEFINE (scm_system_async, "system-async", 1, 0, 0,
   SCM list;
 
   it = scm_async (thunk);
-  SCM_NEWSMOB (list, it, scm_asyncs);
+  SCM_NEWCELL (list);
+  SCM_SETCAR (list, it);
+  SCM_SETCDR (list, scm_asyncs);
   scm_asyncs = list;
   return it;
 }
@@ -467,7 +465,7 @@ void
 scm_init_async ()
 {
   SCM a_thunk;
-  scm_tc16_async = scm_make_smob_type_mfpe ("async", sizeof (struct scm_async),
+  scm_tc16_async = scm_make_smob_type_mfpe ("async", 0,
                                            mark_async, NULL, NULL, NULL);
   scm_gc_vcell = scm_sysintern ("gc-thunk", SCM_BOOL_F);
   a_thunk = scm_make_gsubr ("%gc-thunk", 0, 0, 0, scm_sys_gc_async_thunk);

diff --git a/libguile/async.h b/libguile/async.h
index ff67c7d..1b2981f 100644 (file)
--- a/libguile/async.h
+++ b/libguile/async.h
@@ -2,7 +2,7 @@
 
 #ifndef ASYNCH
 #define ASYNCH
-/*     Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 96, 97, 98, 2000 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,11 +52,11 @@
 
 \f
 #define SCM_ASYNCP(X)  (SCM_NIMP(X) && (scm_tc16_async == SCM_GCTYP16 (X)))
-#define SCM_ASYNC(X)   ((struct scm_async *)SCM_CDR (X))
+#define SCM_ASYNC(X)   ((struct scm_async *) &SCM_CDR (X))
 
 struct scm_async
 {
-  int got_it;                  /* needs to be delivered? */
+  scm_bits_t got_it;           /* needs to be delivered? */
   SCM thunk;                   /* the handler. */
 };