diff options
author | Mark H Weaver <mhw@netris.org> | 2012-10-30 23:46:31 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2012-10-30 23:46:31 -0400 |
commit | fa980bcc0f5b186b98d84fc5d165d35fcbb5d5ec (patch) | |
tree | 411ee841f7526fe7138e42cf399911518df06309 /libguile/ports.h | |
parent | e088b09d7dce5d78c96288778969876b6d25d726 (diff) | |
parent | 10744b7c5007ccac19ea9654be6e749fe6a60992 (diff) | |
download | guile-fa980bcc0f5b186b98d84fc5d165d35fcbb5d5ec.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Moved scm_i_struct_hash from struct.c to hash.c and made it static.
The port's alist is now a field of 'scm_t_port'.
Conflicts:
libguile/arrays.c
libguile/hash.c
libguile/ports.c
libguile/print.h
libguile/read.c
Diffstat (limited to 'libguile/ports.h')
-rw-r--r-- | libguile/ports.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libguile/ports.h b/libguile/ports.h index 92e388e82..c1ba71921 100644 --- a/libguile/ports.h +++ b/libguile/ports.h @@ -132,6 +132,10 @@ typedef struct scm_t_port_encoding_mode encoding_mode; scm_t_string_failed_conversion_handler ilseq_handler; scm_t_iconv_descriptors *iconv_descriptors; + + /* an alist for storing additional information + (e.g. used to store per-port read options) */ + SCM alist; } scm_t_port; |