summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/snarf.h16
-rw-r--r--libguile/variable.h21
2 files changed, 21 insertions, 16 deletions
diff --git a/libguile/snarf.h b/libguile/snarf.h
index 83b40c8aa..7ab432677 100644
--- a/libguile/snarf.h
+++ b/libguile/snarf.h
@@ -85,22 +85,6 @@ DOCSTRING ^^ }
# endif
#endif
-#define SCM_VARIABLE(c_name, scheme_name) \
-SCM_SNARF_HERE(static SCM c_name) \
-SCM_SNARF_INIT(c_name = scm_c_define (scheme_name, SCM_BOOL_F);)
-
-#define SCM_GLOBAL_VARIABLE(c_name, scheme_name) \
-SCM_SNARF_HERE(SCM c_name) \
-SCM_SNARF_INIT(c_name = scm_c_define (scheme_name, SCM_BOOL_F);)
-
-#define SCM_VARIABLE_INIT(c_name, scheme_name, init_val) \
-SCM_SNARF_HERE(static SCM c_name) \
-SCM_SNARF_INIT(c_name = scm_c_define (scheme_name, init_val);)
-
-#define SCM_GLOBAL_VARIABLE_INIT(c_name, scheme_name, init_val) \
-SCM_SNARF_HERE(SCM c_name) \
-SCM_SNARF_INIT(c_name = scm_c_define (scheme_name, init_val);)
-
#define SCM_MUTEX(c_name) \
SCM_SNARF_HERE(static scm_t_mutex c_name) \
SCM_SNARF_INIT(scm_i_plugin_mutex_init (&c_name, &scm_i_plugin_mutex))
diff --git a/libguile/variable.h b/libguile/variable.h
index aac573b60..fda1fb34e 100644
--- a/libguile/variable.h
+++ b/libguile/variable.h
@@ -27,6 +27,7 @@
#include "libguile/__scm.h"
#include <libguile/error.h>
#include <libguile/gc.h>
+#include <libguile/snarf.h>
@@ -40,6 +41,26 @@
#define SCM_VALIDATE_VARIABLE(pos, var) \
SCM_MAKE_VALIDATE_MSG (pos, var, VARIABLEP, "variable")
+
+
+
+#define SCM_VARIABLE(c_name, scheme_name) \
+SCM_SNARF_HERE(static SCM c_name) \
+SCM_SNARF_INIT(c_name = scm_c_define (scheme_name, SCM_BOOL_F);)
+
+#define SCM_GLOBAL_VARIABLE(c_name, scheme_name) \
+SCM_SNARF_HERE(SCM c_name) \
+SCM_SNARF_INIT(c_name = scm_c_define (scheme_name, SCM_BOOL_F);)
+
+#define SCM_VARIABLE_INIT(c_name, scheme_name, init_val) \
+SCM_SNARF_HERE(static SCM c_name) \
+SCM_SNARF_INIT(c_name = scm_c_define (scheme_name, init_val);)
+
+#define SCM_GLOBAL_VARIABLE_INIT(c_name, scheme_name, init_val) \
+SCM_SNARF_HERE(SCM c_name) \
+SCM_SNARF_INIT(c_name = scm_c_define (scheme_name, init_val);)
+
+
SCM_API SCM scm_make_variable (SCM init);