Smob-related creanup.

[bpt/guile.git] / libguile / fluids.h

diff --git a/libguile/fluids.h b/libguile/fluids.h
index f36da3f..7b67318 100644 (file)
--- a/libguile/fluids.h
+++ b/libguile/fluids.h
@@ -3,7 +3,7 @@
 #ifndef FLUIDSH
 #define FLUIDSH
 
-/*     Copyright (C) 1996 Free Software Foundation, Inc.
+/*     Copyright (C) 1996, 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
@@ -73,10 +73,10 @@
    implement a more lightweight version of fluids on top of this basic
    mechanism. */
 
-extern long scm_tc16_fluid;
+extern scm_bits_t scm_tc16_fluid;
 
-#define SCM_FLUIDP(x)    (SCM_NIMP(x) && (SCM_CARW (x) == scm_tc16_fluid))
-#define SCM_FLUID_NUM(x) SCM_ASWORD (SCM_CDR(x))
+#define SCM_FLUIDP(x)    (!SCM_IMP (x) && (SCM_CELL_TYPE (x) == scm_tc16_fluid))
+#define SCM_FLUID_NUM(x) (SCM_CELL_WORD_1 (x))
 
 /* The fastest way to acces/modify the value of a fluid.  These macros
 do no error checking at all.  You should only use them when you know
@@ -107,3 +107,9 @@ void scm_swap_fluids_reverse (SCM fluids, SCM vals);
 void scm_init_fluids (void);
 
 #endif /* !FLUIDSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/