diff options
| author | andreas_kupries <akupries@shaw.ca> | 2006-09-08 19:25:12 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2006-09-08 19:25:12 (GMT) |
| commit | 933d1892317486b9cc87d71fc758ae63193428f9 (patch) | |
| tree | 3272be83b34fc28e97a9d4ededdeba363865394b | |
| parent | 960a7f375c3d5f2f1caa761289f6f2470b9cd227 (diff) | |
| download | tcl-933d1892317486b9cc87d71fc758ae63193428f9.zip tcl-933d1892317486b9cc87d71fc758ae63193428f9.tar.gz tcl-933d1892317486b9cc87d71fc758ae63193428f9.tar.bz2 | |
* unix/tclUnixCompat.c: Fixed conditions for CopyArray/CopyString,
and CopyHostent. Also fixed bad var names in TclpGetHostByName.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | unix/tclUnixCompat.c | 12 |
2 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2006-09-08 Andreas Kupries <andreask@activestate.com> + + * unix/tclUnixCompat.c: Fixed conditions for CopyArray/CopyString, + and CopyHostent. Also fixed bad var names in TclpGetHostByName. + 2006-09-08 Zoran Vasiljevic <vasiljevic@users.sourceforge.net> * unix/tclUnixCompat.c: Added fallback to gethostbyname() diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c index 5ab7ea3..a7d40a7 100644 --- a/unix/tclUnixCompat.c +++ b/unix/tclUnixCompat.c @@ -6,7 +6,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixCompat.c,v 1.1.2.6 2006/09/08 11:15:14 vasiljevic Exp $ + * RCS: @(#) $Id: tclUnixCompat.c,v 1.1.2.7 2006/09/08 19:25:13 andreas_kupries Exp $ * */ @@ -57,8 +57,8 @@ static Tcl_ThreadDataKey dataKey; Tcl_Mutex compatLock; -#if (!defined(HAVE_GETHOSTBYNAME_R) && !defined(HAVE_GETHOSTBYADDR_R)) || \ - (!defined(HAVE_GETPWUID_R) && !defined(HAVE_GETGRGID_R)) +#if (!defined(HAVE_GETHOSTBYNAME_R) || !defined(HAVE_GETHOSTBYADDR_R)) || \ + (!defined(HAVE_GETPWUID_R) || !defined(HAVE_GETGRGID_R)) /* @@ -156,7 +156,7 @@ CopyString(char *src, char *buf, int buflen) !defined(HAVE_GETPWUID_R) && !defined(HAVE_GETGRGID_R) */ -#if !defined(HAVE_GETHOSTBYNAME_R) && !defined(HAVE_GETHOSTBYADDR_R) +#if !defined(HAVE_GETHOSTBYNAME_R) || !defined(HAVE_GETHOSTBYADDR_R) /* *--------------------------------------------------------------------------- @@ -580,8 +580,8 @@ TclpGetHostByName(const char *name) #elif defined(HAVE_GETHOSTBYNAME_R_3) struct hostent_data data; - return (gethostbyname_r(host, &tsdPtr->hent, &data) == 0) ? - &tsdPtr->buf.hent : NULL; + return (gethostbyname_r(name, &tsdPtr->hent, &data) == 0) ? + &tsdPtr->hent : NULL; #else struct hostent *hePtr; Tcl_MutexLock(&compatLock); |