[Guile-commits] 76/86: Move SCM_ARG1, etc definitions to error.h

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 6e51f89d0127d81be4911790ac77772e78a9a493
Author: Andy Wingo <address@hidden>
Date:   Wed Jun 20 15:14:05 2018 +0200

    Move SCM_ARG1, etc definitions to error.h
    
    * libguile/__scm.h:
    * libguile/error.h (SCM_ARGn, SCM_ARG1, SCM_ARG2, SCM_ARG3, SCM_ARG4)
      (SCM_ARG5 SCM_ARG6 SCM_ARG7): Move here.
---
 libguile/__scm.h | 22 ----------------------
 libguile/error.h | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/libguile/__scm.h b/libguile/__scm.h
index 233cdd0..de2c329 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -321,28 +321,6 @@ typedef long SCM_STACKITEM;
 #define SCM_STACK_PTR(ptr) ((SCM_STACKITEM *) (void *) (ptr))
 
 
-#ifndef SCM_MAGIC_SNARFER
-/* Let these macros pass through if
-   we are snarfing;  thus we can tell the
-   difference between the use of an actual
-   number vs. the use of one of these macros --
-   actual numbers in SCM_VALIDATE_* and SCM_ASSERT
-   constructs must match the formal argument name,
-   but using SCM_ARG* avoids the test */
-
-#define SCM_ARGn               0
-#define SCM_ARG1               1
-#define SCM_ARG2               2
-#define SCM_ARG3               3
-#define SCM_ARG4               4
-#define SCM_ARG5               5
-#define SCM_ARG6               6
-#define SCM_ARG7               7
-
-#endif /* SCM_MAGIC_SNARFER */
-
-
-
 /* Handling thread-local storage (TLS).  */
 
 #ifdef SCM_HAVE_THREAD_STORAGE_CLASS
diff --git a/libguile/error.h b/libguile/error.h
index 8a78e8c..30e9066 100644
--- a/libguile/error.h
+++ b/libguile/error.h
@@ -74,6 +74,28 @@ SCM_INTERNAL void scm_init_error (void);
 
 
 
+#ifndef SCM_MAGIC_SNARFER
+/* Let these macros pass through if
+   we are snarfing;  thus we can tell the
+   difference between the use of an actual
+   number vs. the use of one of these macros --
+   actual numbers in SCM_VALIDATE_* and SCM_ASSERT
+   constructs must match the formal argument name,
+   but using SCM_ARG* avoids the test */
+
+#define SCM_ARGn               0
+#define SCM_ARG1               1
+#define SCM_ARG2               2
+#define SCM_ARG3               3
+#define SCM_ARG4               4
+#define SCM_ARG5               5
+#define SCM_ARG6               6
+#define SCM_ARG7               7
+
+#endif /* SCM_MAGIC_SNARFER */
+
+
+
 #define SCM_MAKE_VALIDATE(pos, var, pred) \
   do { \
     SCM_ASSERT_TYPE (SCM_ ## pred (var), var, pos, FUNC_NAME, #pred); \