summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-06-20 11:38:08 +0200
committerAndy Wingo <wingo@pobox.com>2018-06-20 11:38:08 +0200
commitb64941f5af5b59d3e726cc10ecc2431379e73689 (patch)
tree75bb917465fead344a0e92f25ec20183f2a29011
parentd340a9709cf245cf3f12b213734f567c361d03e8 (diff)
downloadguile-b64941f5af5b59d3e726cc10ecc2431379e73689.tar.gz
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.
-rw-r--r--libguile/__scm.h9
-rw-r--r--libguile/chars.h5
-rw-r--r--libguile/numbers.h5
3 files changed, 9 insertions, 10 deletions
diff --git a/libguile/__scm.h b/libguile/__scm.h
index 32d5de354..6861a8104 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 26ba7acd2..36b2ee803 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 1bad7d32f..1164d1916 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