summaryrefslogtreecommitdiff
path: root/libguile/variable.h
diff options
context:
space:
mode:
Diffstat (limited to 'libguile/variable.h')
-rw-r--r--libguile/variable.h38
1 files changed, 11 insertions, 27 deletions
diff --git a/libguile/variable.h b/libguile/variable.h
index b9d84fd8c..9bced2936 100644
--- a/libguile/variable.h
+++ b/libguile/variable.h
@@ -43,7 +43,7 @@
* If you do not wish that, delete this exception notice.
*/
-#include "__scm.h"
+#include "libguile/__scm.h"
@@ -54,34 +54,18 @@ extern int scm_tc16_variable;
#define SCM_VARVCELL(V) SCM_CDR(V)
#define SCM_VARIABLEP(X) (scm_tc16_variable == SCM_CAR(X))
-#define SCM_UDSCM_VARIABLEP(X) (SCM_VARIABLEP(X) && SCM_UNBNDP (SCM_CDR (SCM_VARVCELL (X))))
-#define SCM_DEFSCM_VARIABLEP(X) (SCM_VARIABLEP(X) && !SCM_UNBNDP (SCM_CDR (SCM_VARVCELL (X))))
+#define SCM_UDVARIABLEP(X) (SCM_VARIABLEP(X) && SCM_UNBNDP (SCM_CDR (SCM_VARVCELL (X))))
+#define SCM_DEFVARIABLEP(X) (SCM_VARIABLEP(X) && !SCM_UNBNDP (SCM_CDR (SCM_VARVCELL (X))))
-#ifdef __STDC__
-extern SCM scm_make_variable (SCM init, SCM name_hint);
-extern SCM scm_make_udvariable (SCM name_hint);
-extern SCM scm_variable_p (SCM obj);
-extern SCM scm_variable_ref (SCM var);
-extern SCM scm_variable_set_x (SCM var, SCM val);
-extern SCM scm_builtin_variable (SCM name);
-extern SCM scm_variable_bound_p (SCM var);
-extern void scm_init_variable (void);
-
-#else /* STDC */
-extern SCM scm_make_variable ();
-extern SCM scm_make_udvariable ();
-extern SCM scm_variable_p ();
-extern SCM scm_variable_ref ();
-extern SCM scm_variable_set_x ();
-extern SCM scm_builtin_variable ();
-extern SCM scm_variable_bound_p ();
-extern void scm_init_variable ();
-
-#endif /* STDC */
-
-
-
+extern SCM scm_make_variable SCM_P ((SCM init, SCM name_hint));
+extern SCM scm_make_undefined_variable SCM_P ((SCM name_hint));
+extern SCM scm_variable_p SCM_P ((SCM obj));
+extern SCM scm_variable_ref SCM_P ((SCM var));
+extern SCM scm_variable_set_x SCM_P ((SCM var, SCM val));
+extern SCM scm_builtin_variable SCM_P ((SCM name));
+extern SCM scm_variable_bound_p SCM_P ((SCM var));
+extern void scm_init_variable SCM_P ((void));
#endif /* VARIABLEH */