diff options
author | Michael Gran <spk121@yahoo.com> | 2009-08-01 11:21:46 -0700 |
---|---|---|
committer | Michael Gran <spk121@yahoo.com> | 2009-08-01 11:21:46 -0700 |
commit | a876e7dcea78e770bedba40017fbb225cf88bff5 (patch) | |
tree | 0ac0dc6260f034e625900bf3aa9c37223ba4efe6 | |
parent | f7118e35525e1c137f2fb96619233610549fae12 (diff) | |
download | guile-a876e7dcea78e770bedba40017fbb225cf88bff5.tar.gz |
Don't doubly define scm_t_wchar
* libguile/chars.h: don't define scm_t_wchar
* libguile/numbers.h: define scm_t_wchar here
-rw-r--r-- | libguile/chars.h | 7 | ||||
-rw-r--r-- | libguile/numbers.h | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/libguile/chars.h b/libguile/chars.h index 97fa0cd95..4d1be1db9 100644 --- a/libguile/chars.h +++ b/libguile/chars.h @@ -24,16 +24,11 @@ #include "libguile/__scm.h" +#include "libguile/numbers.h" /* Immediate Characters */ - -#ifndef SCM_WCHAR_DEFINED -typedef scm_t_int32 scm_t_wchar; -#define SCM_WCHAR_DEFINED -#endif - #define SCM_CHARP(x) (SCM_ITAG8(x) == scm_tc8_char) #define SCM_CHAR(x) ((scm_t_wchar)SCM_ITAG8_DATA(x)) diff --git a/libguile/numbers.h b/libguile/numbers.h index f30f7d061..bb72d7ac8 100644 --- a/libguile/numbers.h +++ b/libguile/numbers.h @@ -174,10 +174,7 @@ typedef struct scm_t_complex double imag; } scm_t_complex; -#ifndef SCM_WCHAR_DEFINED typedef scm_t_int32 scm_t_wchar; -#define SCM_WCHAR_DEFINED -#endif |