diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-10 07:24:00 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-10 07:24:00 +0000 |
commit | c3a66e8a72e7ba6cc25c09d0abacbefcd06f51f7 (patch) | |
tree | ecec54d538c9d3907f0c23e9623ce83cc92aaee0 | |
parent | 052bfaea1f926c74207d18541027da5ad01486b5 (diff) | |
download | ruby-c3a66e8a72e7ba6cc25c09d0abacbefcd06f51f7.tar.gz ruby-c3a66e8a72e7ba6cc25c09d0abacbefcd06f51f7.tar.xz ruby-c3a66e8a72e7ba6cc25c09d0abacbefcd06f51f7.zip |
auxiliary routines update.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ext/gdbm/gdbm.c | 6 | ||||
-rw-r--r-- | ruby.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c index fba4d2386..0fa13a5e6 100644 --- a/ext/gdbm/gdbm.c +++ b/ext/gdbm/gdbm.c @@ -167,7 +167,7 @@ rb_gdbm_fetch(dbm, key) RSTRING(str)->ptr = 0; RSTRING(str)->len = val.dsize; - RSTRING(str)->orig = 0; + RSTRING(str)->aux.capa = val.dsize; RSTRING(str)->ptr = REALLOC_N(val.dptr,char,val.dsize+1); RSTRING(str)->ptr[val.dsize] = '\0'; @@ -214,7 +214,7 @@ rb_gdbm_firstkey(dbm) RSTRING(str)->ptr = 0; RSTRING(str)->len = key.dsize; - RSTRING(str)->orig = 0; + RSTRING(str)->aux.capa = key.dsize; RSTRING(str)->ptr = REALLOC_N(key.dptr,char,key.dsize+1); RSTRING(str)->ptr[RSTRING(str)->len] = '\0'; @@ -238,7 +238,7 @@ rb_gdbm_nextkey(dbm, keystr) RSTRING(str)->ptr = 0; RSTRING(str)->len = key2.dsize; - RSTRING(str)->orig = 0; + RSTRING(str)->aux.capa = key2.dsize; RSTRING(str)->ptr = REALLOC_N(key2.dptr,char,key2.dsize+1); RSTRING(str)->ptr[RSTRING(str)->len] = '\0'; @@ -35,6 +35,7 @@ extern "C" { #include <stdio.h> /* need to include <ctype.h> to use these macros */ +#ifndef ISPRINT #define ISASCII(c) isascii((unsigned char)(c)) #undef ISPRINT #define ISPRINT(c) (ISASCII(c) && isprint((unsigned char)(c))) @@ -45,6 +46,7 @@ extern "C" { #define ISALPHA(c) (ISASCII(c) && isalpha((unsigned char)(c))) #define ISDIGIT(c) (ISASCII(c) && isdigit((unsigned char)(c))) #define ISXDIGIT(c) (ISASCII(c) && isxdigit((unsigned char)(c))) +#endif #if !defined(__STDC__) && !defined(_MSC_VER) # define volatile |