[Guile-commits] 48/86: Deprecate SCM_STATIC_DOUBLE_CELL snarf macro

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 8f8e450a60f79d90326e59bc4d44616a60fe90c6
Author: Andy Wingo <address@hidden>
Date:   Wed Jun 20 09:13:11 2018 +0200

    Deprecate SCM_STATIC_DOUBLE_CELL snarf macro
    
    * libguile/snarf.h:
    * libguile/deprecated.h (SCM_STATIC_DOUBLE_CELL): Deprecate this unused
      macro.
---
 libguile/deprecated.h | 12 ++++++++++++
 libguile/snarf.h      |  9 ---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/libguile/deprecated.h b/libguile/deprecated.h
index 0c0f6e5..43c31d8 100644
--- a/libguile/deprecated.h
+++ b/libguile/deprecated.h
@@ -20,6 +20,7 @@
  */
 
 #include "libguile/__scm.h"
+#include "libguile/snarf.h"
 
 #if (SCM_ENABLE_DEPRECATED == 1)
 
@@ -42,6 +43,17 @@
                 v, pos, FUNC_NAME); \
   } while (0)
 
+#ifdef SCM_SUPPORT_STATIC_ALLOCATION
+#define SCM_STATIC_DOUBLE_CELL(c_name, car, cbr, ccr, cdr)             \
+  static SCM_ALIGNED (8) SCM_UNUSED scm_t_cell                          \
+  c_name ## _raw_cell [2] =                                            \
+    {                                                                  \
+      { SCM_PACK (car), SCM_PACK (cbr) },                              \
+      { SCM_PACK (ccr), SCM_PACK (cdr) }                               \
+    };                                                                 \
+  static SCM_UNUSED SCM c_name = SCM_PACK (& c_name ## _raw_cell)
+#endif /* SCM_SUPPORT_STATIC_ALLOCATION */
+
 #define scm_gc_running_p  0
 
 void scm_i_init_deprecated (void);
diff --git a/libguile/snarf.h b/libguile/snarf.h
index 836067b..8bafcf5 100644
--- a/libguile/snarf.h
+++ b/libguile/snarf.h
@@ -196,15 +196,6 @@ SCM_SNARF_INIT(scm_set_smob_apply((tag), (c_name), (req), 
(opt), (rest));)
     };                                                                 \
   static SCM_UNUSED const SCM c_name = SCM_PACK (& c_name ## _raw_cell)
 
-#define SCM_STATIC_DOUBLE_CELL(c_name, car, cbr, ccr, cdr)             \
-  static SCM_ALIGNED (8) SCM_UNUSED scm_t_cell                          \
-  c_name ## _raw_cell [2] =                                            \
-    {                                                                  \
-      { SCM_PACK (car), SCM_PACK (cbr) },                              \
-      { SCM_PACK (ccr), SCM_PACK (cdr) }                               \
-    };                                                                 \
-  static SCM_UNUSED SCM c_name = SCM_PACK (& c_name ## _raw_cell)
-
 #define SCM_IMMUTABLE_STRINGBUF(c_name, contents)      \
   static SCM_UNUSED const                              \
   struct                                               \