From b614db0432aa9ab228cc4eca773fdc30ec6c900a Mon Sep 17 00:00:00 2001 From: eban Date: Tue, 20 May 2003 06:48:04 +0000 Subject: * st.h: define ST_DATA_T_DEFINED for portability. * ext/syck/syck.h: add typedef, st_data_t for Ruby 1.6. * ext/syck/syck.c (syck_st_free_nodes): return int. * ext/syck/syck.c (syck_add_sym): cast the data to st_data_t to avoid error on bcc32. * ext/syck/syck.c (syck_lookup_sym): ditto. * ext/syck/syck.c (syck_free_parser): NULL is not integer. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/syck/syck.c | 8 ++++---- ext/syck/syck.h | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'ext/syck') diff --git a/ext/syck/syck.c b/ext/syck/syck.c index 89aa804e44..068c1952cf 100644 --- a/ext/syck/syck.c +++ b/ext/syck/syck.c @@ -188,7 +188,7 @@ syck_add_sym( SyckParser *p, char *data ) p->syms = st_init_numtable(); } id = p->syms->num_entries; - st_insert( p->syms, id, data ); + st_insert( p->syms, id, (st_data_t)data ); return id; } @@ -196,10 +196,10 @@ int syck_lookup_sym( SyckParser *p, SYMID id, char **data ) { if ( p->syms == NULL ) return 0; - return st_lookup( p->syms, id, data ); + return st_lookup( p->syms, id, (st_data_t *)data ); } -enum st_retval +int syck_st_free_nodes( char *key, SyckNode *n, char *arg ) { syck_free_node( n ); @@ -223,7 +223,7 @@ syck_free_parser( SyckParser *p ) // // Free the anchor table // - st_foreach( p->anchors, syck_st_free_nodes, NULL ); + st_foreach( p->anchors, syck_st_free_nodes, 0 ); st_free_table( p->anchors ); // diff --git a/ext/syck/syck.h b/ext/syck/syck.h index 6bba91bb54..6d10cab714 100644 --- a/ext/syck/syck.h +++ b/ext/syck/syck.h @@ -14,7 +14,7 @@ #define YAML_DOMAIN "yaml.org,2002" #include -#include "../../st.h" +#include "st.h" #if defined(__cplusplus) extern "C" { @@ -257,6 +257,10 @@ long syck_seq_count( SyckNode * ); void apply_seq_in_map( SyckParser *, SyckNode * ); +#ifndef ST_DATA_T_DEFINED +typedef long st_data_t; +#endif + #if defined(__cplusplus) } /* extern "C" { */ #endif -- cgit v1.2.3