summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-03-01 02:32:21 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-03-01 02:32:21 +0000
commit1188f3f1d947a9fe7d87c15ef226d383347b107a (patch)
treeb7dc008d6846f3dba3c99b6d240d608e0c85ee4e
parenta5ecc30e7d3570398dfa7b7d89b520989f61f75f (diff)
* ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): add const
qualifier only for uClibc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/addrinfo.h5
-rw-r--r--ext/socket/getaddrinfo.c5
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4126a07e00..885f847f0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 1 11:29:10 2002 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): add const
+ qualifier only for uClibc.
+
Fri Mar 1 11:22:51 2002 Amos Gouaux <amos+ruby@utdallas.edu>
* lib/net/imap.rb: added document.
diff --git a/ext/socket/addrinfo.h b/ext/socket/addrinfo.h
index aaa309cfdd..bd3de72e10 100644
--- a/ext/socket/addrinfo.h
+++ b/ext/socket/addrinfo.h
@@ -154,7 +154,10 @@ extern int getnameinfo __P((
extern void freehostent __P((struct hostent *));
extern void freeaddrent __P((struct addrinfo *));
-extern const char *gai_strerror __P((int));
+#if defined __UCLIBC__
+const
+#endif
+extern 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 863d31ea6e..fa060ad171 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -191,7 +191,10 @@ if (pai->ai_flags & AI_CANONNAME) {\
#define ERR(err) { error = (err); goto bad; }
-const char *
+#if defined __UCLIBC__
+const
+#endif
+char *
gai_strerror(ecode)
int ecode;
{