diff options
author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-02-27 04:30:20 +0000 |
---|---|---|
committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-02-27 04:30:20 +0000 |
commit | a08335cc90e1e6d559b0ead207c42babe424ec57 (patch) | |
tree | abcd69737200c0b681567ceda0d6263882c10cbe | |
parent | a01e4cbdb10e7295c70d5070e5c96355f18d26c1 (diff) |
* io.c (READ_DATA_PENDING): uClibc support.
* random.c (rand_init): ditto.
* ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ext/socket/addrinfo.h | 2 | ||||
-rw-r--r-- | ext/socket/getaddrinfo.c | 2 | ||||
-rw-r--r-- | io.c | 2 | ||||
-rw-r--r-- | random.c | 2 | ||||
-rw-r--r-- | version.h | 4 |
6 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Wed Feb 27 13:18:49 2002 WATANABE Hirofumi <eban@ruby-lang.org> + + * io.c (READ_DATA_PENDING): uClibc support. + + * random.c (rand_init): ditto. + + * ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): ditto. + Wed Feb 27 07:08:16 2002 Akinori MUSHA <knu@iDaemons.org> * ext/digest/sha2/sha2.c: Merge from rough. Fix a couple of diff --git a/ext/socket/addrinfo.h b/ext/socket/addrinfo.h index 6000a466ba..aaa309cfdd 100644 --- a/ext/socket/addrinfo.h +++ b/ext/socket/addrinfo.h @@ -154,7 +154,7 @@ extern int getnameinfo __P(( extern void freehostent __P((struct hostent *)); extern void freeaddrent __P((struct addrinfo *)); -extern char *gai_strerror __P((int)); +extern const char *gai_strerror __P((int)); /* In case there is no definition of offsetof() provided - though any proper Standard C system should have one. */ diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index d518017bc8..863d31ea6e 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -191,7 +191,7 @@ if (pai->ai_flags & AI_CANONNAME) {\ #define ERR(err) { error = (err); goto bad; } -char * +const char * gai_strerror(ecode) int ecode; { @@ -111,6 +111,8 @@ static VALUE lineno; # define READ_DATA_PENDING(fp) ((fp)->FILE_COUNT > 0) #elif defined(__BEOS__) # define READ_DATA_PENDING(fp) (fp->_state._eof == 0) +#elif defined(__UCLIBC__) +# define READ_DATA_PENDING(fp) ((fp)->bufpos < (fp)->bufend) #else /* requires systems own version of the ReadDataPending() */ extern int ReadDataPending(); @@ -88,7 +88,7 @@ rand_init(seed) int old; static unsigned int saved_seed; -#ifdef HAVE_RANDOM +#if defined HAVE_RANDOM && !defined __UCLIBC__ if (first == 1) { initstate(1, state, sizeof state); } @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.6.7" -#define RUBY_RELEASE_DATE "2002-02-26" +#define RUBY_RELEASE_DATE "2002-02-27" #define RUBY_VERSION_CODE 167 -#define RUBY_RELEASE_CODE 20020226 +#define RUBY_RELEASE_CODE 20020227 |