diff options
| author | stwo <stwo> | 2012-08-13 14:18:55 (GMT) |
|---|---|---|
| committer | stwo <stwo> | 2012-08-13 14:18:55 (GMT) |
| commit | 263ace8ece084001464b1b3f8cdf0bfff4ec8538 (patch) | |
| tree | 9b32377fcd2dc46a6a895dda4683ebc911c3e448 | |
| parent | 026db9973900d03ebaf3e280f8300e3916fe0aaa (diff) | |
| download | tcl-263ace8ece084001464b1b3f8cdf0bfff4ec8538.zip tcl-263ace8ece084001464b1b3f8cdf0bfff4ec8538.tar.gz tcl-263ace8ece084001464b1b3f8cdf0bfff4ec8538.tar.bz2 | |
[Bug 3555454] Rearrange a bit to quash 'declared but never defined' compiler warnings.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | unix/tclUnixCompat.c | 16 |
2 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2010-08-13 Stuart Cassoff <stwo@users.sourceforge.net> + + * unix/tclUnixCompat.c: [Bug 3555454] Rearrange a bit + to quash 'declared but never defined' compiler warnings. + 2012-08-13 Jan Nijtmans <nijtmans@users.sf.net> * compat/zlib/win64/zlib1.dll: Add 64-bit build of zlib1.dll, and use it diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c index 359e253..e201018 100644 --- a/unix/tclUnixCompat.c +++ b/unix/tclUnixCompat.c @@ -99,12 +99,20 @@ static Tcl_Mutex compatLock; #undef NEED_COPYPWD #undef NEED_COPYSTRING +#if !defined(HAVE_GETGRNAM_R_5) && !defined(HAVE_GETGRNAM_R_4) +#define NEED_COPYGRP 1 +static int CopyGrp(struct group *tgtPtr, char *buf, int buflen); +#endif + +#if !defined(HAVE_GETPWNAM_R_5) && !defined(HAVE_GETPWNAM_R_4) +#define NEED_COPYPWD 1 +static int CopyPwd(struct passwd *tgtPtr, char *buf, int buflen); +#endif + static int CopyArray(char **src, int elsize, char *buf, int buflen); -static int CopyGrp(struct group *tgtPtr, char *buf, int buflen); static int CopyHostent(struct hostent *tgtPtr, char *buf, int buflen); -static int CopyPwd(struct passwd *tgtPtr, char *buf, int buflen); static int CopyString(const char *src, char *buf, int buflen); #endif @@ -214,7 +222,6 @@ TclpGetPwNam( return getpwnam_r(name, &tsdPtr->pwd, tsdPtr->pbuf, sizeof(tsdPtr->pbuf)); #else -#define NEED_COPYPWD 1 struct passwd *pwPtr; Tcl_MutexLock(&compatLock); @@ -295,7 +302,6 @@ TclpGetPwUid( return getpwuid_r(uid, &tsdPtr->pwd, tsdPtr->pbuf, sizeof(tsdPtr->pbuf)); #else -#define NEED_COPYPWD 1 struct passwd *pwPtr; Tcl_MutexLock(&compatLock); @@ -399,7 +405,6 @@ TclpGetGrNam( return getgrnam_r(name, &tsdPtr->grp, tsdPtr->gbuf, sizeof(tsdPtr->gbuf)); #else -#define NEED_COPYGRP 1 struct group *grPtr; Tcl_MutexLock(&compatLock); @@ -480,7 +485,6 @@ TclpGetGrGid( return getgrgid_r(gid, &tsdPtr->grp, tsdPtr->gbuf, sizeof(tsdPtr->gbuf)); #else -#define NEED_COPYGRP 1 struct group *grPtr; Tcl_MutexLock(&compatLock); |