diff options
author | Andy Wingo <wingo@pobox.com> | 2011-05-13 15:45:43 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-05-13 15:45:43 +0200 |
commit | 86fb1eb631d455aec634aa475a14d2c88052752c (patch) | |
tree | 98936072396a05aa1e4a6d177452f6d5e65a62f5 /libguile/expand.h | |
parent | fc7bd367ab4b5027a7f80686b1e229c62e43c90b (diff) | |
parent | 2002f1f84797c2c46d0634eabd5ac5fd61e13d73 (diff) | |
download | guile-86fb1eb631d455aec634aa475a14d2c88052752c.tar.gz |
merge strictness branch from 2.0
Diffstat (limited to 'libguile/expand.h')
-rw-r--r-- | libguile/expand.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libguile/expand.h b/libguile/expand.h index b5d90edce..02e6e179e 100644 --- a/libguile/expand.h +++ b/libguile/expand.h @@ -3,7 +3,7 @@ #ifndef SCM_EXPAND_H #define SCM_EXPAND_H -/* Copyright (C) 2010 +/* Copyright (C) 2010, 2011 * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -73,8 +73,9 @@ enum SCM_EXPANDED_TYPE_FIELDS, }; -#define SCM_EXPANDED_P(x) \ - (SCM_STRUCTP (x) && (SCM_STRUCT_VTABLE (SCM_STRUCT_VTABLE (x)) == scm_exp_vtable_vtable)) +#define SCM_EXPANDED_P(x) \ + (SCM_STRUCTP (x) \ + && (scm_is_eq (SCM_STRUCT_VTABLE (SCM_STRUCT_VTABLE (x)), scm_exp_vtable_vtable))) #define SCM_EXPANDED_REF(x,type,field) \ (scm_struct_ref (x, SCM_I_MAKINUM (SCM_EXPANDED_##type##_##field))) #define SCM_EXPANDED_TYPE(x) \ |