[Guile-commits] 58/86: Define scm_t_wchar in one place

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit b64941f5af5b59d3e726cc10ecc2431379e73689
Author: Andy Wingo <address@hidden>
Date:   Wed Jun 20 11:38:08 2018 +0200

    Define scm_t_wchar in one place
    
    * libguile/__scm.h (scm_t_wchar): Move definition here, closer to
      scm_t_int32 definition (pulled in by scmconfig.h).
    * libguile/numbers.h:
    * libguile/chars.h: Remove weird maybe-definitions.
---
 libguile/__scm.h   | 9 +++++++++
 libguile/chars.h   | 5 -----
 libguile/numbers.h | 5 -----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/libguile/__scm.h b/libguile/__scm.h
index 32d5de3..6861a81 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -422,6 +422,15 @@ typedef long SCM_STACKITEM;
 
 #endif  /* SCM___SCM_H */
 
+
+
+
+/* Trivial type declarations and forward declarations.  */
+typedef scm_t_int32 scm_t_wchar;
+
+
+
+
 /*
   Local Variables:
   c-file-style: "gnu"
diff --git a/libguile/chars.h b/libguile/chars.h
index 26ba7ac..36b2ee8 100644
--- a/libguile/chars.h
+++ b/libguile/chars.h
@@ -27,11 +27,6 @@
 #include "libguile/__scm.h"
 #include <libguile/error.h>
 
-#ifndef SCM_T_WCHAR_DEFINED
-typedef scm_t_int32 scm_t_wchar;
-#define SCM_T_WCHAR_DEFINED
-#endif /* SCM_T_WCHAR_DEFINED */
-
 
 /* Immediate Characters
  */
diff --git a/libguile/numbers.h b/libguile/numbers.h
index 1bad7d3..1164d19 100644
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -32,11 +32,6 @@
 #include "libguile/gc.h"
 #include "libguile/print.h"
 
-#ifndef SCM_T_WCHAR_DEFINED
-typedef scm_t_int32 scm_t_wchar;
-#define SCM_T_WCHAR_DEFINED
-#endif /* SCM_T_WCHAR_DEFINED */
-
 
 
 /* Immediate Numbers, also known as fixnums