Prefixed each each exported symbol with SCM_API.

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

diff --git a/libguile/fluids.h b/libguile/fluids.h
index 0058cfd..ba6437b 100644 (file)
--- a/libguile/fluids.h
+++ b/libguile/fluids.h
@@ -1,20 +1,20 @@
 /* classes: h_files */
 
-#ifndef FLUIDSH
-#define FLUIDSH
+#ifndef SCM_FLUIDS_H
+#define SCM_FLUIDS_H
 
-/*     Copyright (C) 1996 Free Software Foundation, Inc.
- * 
+/* Copyright (C) 1996,2000,2001 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
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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, Inc., 59 Temple Place, Suite 330,
@@ -44,8 +44,7 @@
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.  */
 
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
-   gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
+\f
 
 #include "libguile/__scm.h"
 #include "libguile/root.h"
@@ -73,10 +72,10 @@
    implement a more lightweight version of fluids on top of this basic
    mechanism. */
 
-extern long scm_tc16_fluid;
+SCM_API scm_t_bits scm_tc16_fluid;
 
-#define SCM_FLUIDP(x)    (SCM_NIMP(x) && (SCM_UNPACK_CAR (x) == scm_tc16_fluid))
-#define SCM_FLUID_NUM(x) SCM_UNPACK (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
@@ -90,23 +89,25 @@ SCM_FLUID_NUM, not the fluid itself. */
 #define SCM_FAST_FLUID_REF(n) (SCM_VELTS(scm_root->fluids)[n])
 #define SCM_FAST_FLUID_SET_X(n, val) (SCM_VELTS(scm_root->fluids)[n] = val)
 
-SCM scm_make_fluid (void);
-SCM scm_fluid_p (SCM fl);
-SCM scm_fluid_ref (SCM fluid);
-SCM scm_fluid_set_x (SCM fluid, SCM value);
+SCM_API SCM scm_make_fluid (void);
+SCM_API SCM scm_fluid_p (SCM fl);
+SCM_API SCM scm_fluid_ref (SCM fluid);
+SCM_API SCM scm_fluid_set_x (SCM fluid, SCM value);
 
-SCM scm_internal_with_fluids (SCM fluids, SCM vals,
-                              SCM (*cproc)(void *), void *cdata);
-SCM scm_with_fluids (SCM fluids, SCM vals, SCM thunk);
+SCM_API SCM scm_c_with_fluids (SCM fluids, SCM vals,
+                              SCM (*cproc)(void *), void *cdata);
+SCM_API SCM scm_c_with_fluid (SCM fluid, SCM val,
+                             SCM (*cproc)(void *), void *cdata);
+SCM_API SCM scm_with_fluids (SCM fluids, SCM vals, SCM thunk);
 
-SCM scm_make_initial_fluids (void);
-void scm_copy_fluids (scm_root_state *);
-void scm_swap_fluids (SCM fluids, SCM vals);
-void scm_swap_fluids_reverse (SCM fluids, SCM vals);
+SCM_API SCM scm_make_initial_fluids (void);
+SCM_API void scm_copy_fluids (scm_root_state *);
+SCM_API void scm_swap_fluids (SCM fluids, SCM vals);
+SCM_API void scm_swap_fluids_reverse (SCM fluids, SCM vals);
 
-void scm_init_fluids (void);
+SCM_API void scm_init_fluids (void);
 
-#endif /* !FLUIDSH */
+#endif  /* SCM_FLUIDS_H */
 
 /*
   Local Variables: