* Makefile.am: Added modules.c, modules.x, modules.h.

[bpt/guile.git] / libguile / arbiters.c

diff --git a/libguile/arbiters.c b/libguile/arbiters.c
index da7b5dc..a8788a7 100644 (file)
--- a/libguile/arbiters.c
+++ b/libguile/arbiters.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995,1996 Free Software Foundation, Inc.
+/*     Copyright (C) 1995,1996, 1997 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
@@ -12,7 +12,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -36,8 +37,7 @@
  *
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  
- */
+ * If you do not wish that, delete this exception notice.  */
 \f
 
 #include <stdio.h>
@@ -56,22 +56,18 @@
 
 static long scm_tc16_arbiter;
 
-#ifdef __STDC__
-static int 
-prinarb (SCM exp, SCM port, scm_print_state *pstate)
-#else
+
 static int 
 prinarb (exp, port, pstate)
      SCM exp;
      SCM port;
      scm_print_state *pstate;
-#endif
 {
-  scm_gen_puts (scm_regular_string, "#<arbiter ", port);
+  scm_puts ("#<arbiter ", port);
   if (SCM_CAR (exp) & (1L << 16))
-    scm_gen_puts (scm_regular_string, "locked ", port);
+    scm_puts ("locked ", port);
   scm_iprin1 (SCM_CDR (exp), port, pstate);
-  scm_gen_putc ('>', port);
+  scm_putc ('>', port);
   return !0;
 }
 
@@ -81,31 +77,25 @@ static scm_smobfuns arbsmob =
 };
 
 SCM_PROC(s_make_arbiter, "make-arbiter", 1, 0, 0, scm_make_arbiter);
-#ifdef __STDC__
-SCM 
-scm_make_arbiter (SCM name)
-#else
+
 SCM 
 scm_make_arbiter (name)
      SCM name;
-#endif
 {
   register SCM z;
   SCM_NEWCELL (z);
-  SCM_CDR (z) = name;
-  SCM_CAR (z) = scm_tc16_arbiter;
+  SCM_DEFER_INTS;
+  SCM_SETCDR (z, name);
+  SCM_SETCAR (z, scm_tc16_arbiter);
+  SCM_ALLOW_INTS;
   return z;
 }
 
 SCM_PROC(s_try_arbiter, "try-arbiter", 1, 0, 0, scm_try_arbiter);
-#ifdef __STDC__
-SCM 
-scm_try_arbiter (SCM arb)
-#else
+
 SCM 
 scm_try_arbiter (arb)
      SCM arb;
-#endif
 {
   SCM_ASSERT ((SCM_TYP16 (arb) == scm_tc16_arbiter), arb, SCM_ARG1, s_try_arbiter);
   SCM_DEFER_INTS;
@@ -113,7 +103,7 @@ scm_try_arbiter (arb)
     arb = SCM_BOOL_F;
   else
     {
-      SCM_CAR (arb) = scm_tc16_arbiter | (1L << 16);
+      SCM_SETCAR (arb, scm_tc16_arbiter | (1L << 16));
       arb = SCM_BOOL_T;
     }
   SCM_ALLOW_INTS;
@@ -122,30 +112,22 @@ scm_try_arbiter (arb)
 
 
 SCM_PROC(s_release_arbiter, "release-arbiter", 1, 0, 0, scm_release_arbiter);
-#ifdef __STDC__
-SCM 
-scm_release_arbiter (SCM arb)
-#else
+
 SCM 
 scm_release_arbiter (arb)
      SCM arb;
-#endif
 {
   SCM_ASSERT ((SCM_TYP16 (arb) == scm_tc16_arbiter), arb, SCM_ARG1, s_release_arbiter);
   if (!(SCM_CAR (arb) & (1L << 16)))
     return SCM_BOOL_F;
-  SCM_CAR (arb) = scm_tc16_arbiter;
+  SCM_SETCAR (arb, scm_tc16_arbiter);
   return SCM_BOOL_T;
 }
 
 
-#ifdef __STDC__
-void
-scm_init_arbiters (void)
-#else
+
 void
 scm_init_arbiters ()
-#endif
 {
   scm_tc16_arbiter = scm_newsmob (&arbsmob);
 #include "arbiters.x"