diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-03-28 15:36:48 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-03-28 15:36:48 +0000 |
| commit | e37b3e7228a2b4ffeb54acfbb36349193a31100d (patch) | |
| tree | 67baa21117da89d134e6ac344a49b9c4652ff1a0 /gl | |
| parent | fe3257c2615d81805c1e149ba95295c3f19a9909 (diff) | |
| download | gnutls-e37b3e7228a2b4ffeb54acfbb36349193a31100d.tar.gz | |
Update.
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/getaddrinfo.c | 2 | ||||
| -rw-r--r-- | gl/string_.h | 4 | ||||
| -rw-r--r-- | gl/version-etc.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gl/getaddrinfo.c b/gl/getaddrinfo.c index cc718bcf33..aa07903445 100644 --- a/gl/getaddrinfo.c +++ b/gl/getaddrinfo.c @@ -179,7 +179,7 @@ getaddrinfo (const char *restrict nodename, const char *proto = (hints && hints->ai_socktype == SOCK_DGRAM) ? "udp" : "tcp"; - if (!(hints->ai_flags & AI_NUMERICSERV)) + if (hints == NULL || !(hints->ai_flags & AI_NUMERICSERV)) /* FIXME: Use getservbyname_r if available. */ se = getservbyname (servname, proto); diff --git a/gl/string_.h b/gl/string_.h index 483c9fc3ff..b50523cce0 100644 --- a/gl/string_.h +++ b/gl/string_.h @@ -192,9 +192,9 @@ extern char *strdup (char const *__s); # if ! @HAVE_STRNDUP@ # undef strndup # define strndup rpl_strndup -# if ! @HAVE_DECL_STRNDUP@ +# endif +# if ! @HAVE_STRNDUP@ || ! @HAVE_DECL_STRNDUP@ extern char *strndup (char const *__string, size_t __n); -# endif # endif #elif defined GNULIB_POSIXCHECK # undef strndup diff --git a/gl/version-etc.c b/gl/version-etc.c index 65997d9188..1ae82c4179 100644 --- a/gl/version-etc.c +++ b/gl/version-etc.c @@ -67,8 +67,8 @@ version_etc_va (FILE *stream, fputs (_("\ \n\ -This is free software. You may redistribute copies of it under the terms of\n\ -the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n\ +License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n\ +This is free software: you are free to change and redistribute it.\n\ There is NO WARRANTY, to the extent permitted by law.\n\ \n\ "), |