diff options
author | das <das> | 2002-08-06 01:49:27 (GMT) |
---|---|---|
committer | das <das> | 2002-08-06 01:49:27 (GMT) |
commit | 662e3f9cf9ef3534b5ac05ea668b44fd912d2180 (patch) | |
tree | 19d006042c2fe2684711080b502d5def97fef349 /generic | |
parent | 97436a436ee4b19926ee332ba593027e24264efc (diff) | |
download | tcl-662e3f9cf9ef3534b5ac05ea668b44fd912d2180.zip tcl-662e3f9cf9ef3534b5ac05ea668b44fd912d2180.tar.gz tcl-662e3f9cf9ef3534b5ac05ea668b44fd912d2180.tar.bz2 |
* generic/tclInt.decls:
* unix/tclUnixThrd.c: Added stubs and implementations for
non-threaded build for the tclUnixThrd.c procs TclpReaddir,
TclpLocaltime, TclpGmtime and TclpInetNtoa.
Fixes link errors in stubbed & threaded extensions that include
tclUnixPort.h and use any of the procs readdir, localtime,
gmtime or inet_ntoa (e.g. TclX 8.4) [Bug 589526]
* generic/tclIntPlatDecls.h:
* generic/tclStubInit.c: Regen.
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tclInt.decls | 20 | ||||
-rw-r--r-- | generic/tclIntPlatDecls.h | 30 | ||||
-rw-r--r-- | generic/tclStubInit.c | 6 |
3 files changed, 53 insertions, 3 deletions
diff --git a/generic/tclInt.decls b/generic/tclInt.decls index 5a91a50..8c1e733 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tclInt.decls,v 1.54 2002/08/05 03:24:40 dgp Exp $ +# RCS: @(#) $Id: tclInt.decls,v 1.55 2002/08/06 01:49:27 das Exp $ library tcl @@ -954,3 +954,21 @@ declare 9 unix { TclFile TclpCreateTempFile(CONST char *contents) } +# Added in 8.4: + +declare 10 unix { + Tcl_DirEntry * TclpReaddir(DIR * dir) +} + +declare 11 unix { + struct tm * TclpLocaltime(time_t * clock) +} + +declare 12 unix { + struct tm * TclpGmtime(time_t * clock) +} + +declare 13 unix { + char * TclpInetNtoa(struct in_addr addr) +} + diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 090d3d1..b430443 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.17 2002/04/19 14:18:38 das Exp $ + * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.18 2002/08/06 01:49:27 das Exp $ */ #ifndef _TCLINTPLATDECLS @@ -59,6 +59,14 @@ EXTERN int TclUnixWaitForFile _ANSI_ARGS_((int fd, int mask, /* 9 */ EXTERN TclFile TclpCreateTempFile _ANSI_ARGS_(( CONST char * contents)); +/* 10 */ +EXTERN Tcl_DirEntry * TclpReaddir _ANSI_ARGS_((DIR * dir)); +/* 11 */ +EXTERN struct tm * TclpLocaltime _ANSI_ARGS_((time_t * clock)); +/* 12 */ +EXTERN struct tm * TclpGmtime _ANSI_ARGS_((time_t * clock)); +/* 13 */ +EXTERN char * TclpInetNtoa _ANSI_ARGS_((struct in_addr addr)); #endif /* UNIX */ #ifdef __WIN32__ /* 0 */ @@ -218,6 +226,10 @@ typedef struct TclIntPlatStubs { TclFile (*tclpOpenFile) _ANSI_ARGS_((CONST char * fname, int mode)); /* 7 */ int (*tclUnixWaitForFile) _ANSI_ARGS_((int fd, int mask, int timeout)); /* 8 */ TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char * contents)); /* 9 */ + Tcl_DirEntry * (*tclpReaddir) _ANSI_ARGS_((DIR * dir)); /* 10 */ + struct tm * (*tclpLocaltime) _ANSI_ARGS_((time_t * clock)); /* 11 */ + struct tm * (*tclpGmtime) _ANSI_ARGS_((time_t * clock)); /* 12 */ + char * (*tclpInetNtoa) _ANSI_ARGS_((struct in_addr addr)); /* 13 */ #endif /* UNIX */ #ifdef __WIN32__ void (*tclWinConvertError) _ANSI_ARGS_((DWORD errCode)); /* 0 */ @@ -332,6 +344,22 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr; #define TclpCreateTempFile \ (tclIntPlatStubsPtr->tclpCreateTempFile) /* 9 */ #endif +#ifndef TclpReaddir +#define TclpReaddir \ + (tclIntPlatStubsPtr->tclpReaddir) /* 10 */ +#endif +#ifndef TclpLocaltime +#define TclpLocaltime \ + (tclIntPlatStubsPtr->tclpLocaltime) /* 11 */ +#endif +#ifndef TclpGmtime +#define TclpGmtime \ + (tclIntPlatStubsPtr->tclpGmtime) /* 12 */ +#endif +#ifndef TclpInetNtoa +#define TclpInetNtoa \ + (tclIntPlatStubsPtr->tclpInetNtoa) /* 13 */ +#endif #endif /* UNIX */ #ifdef __WIN32__ #ifndef TclWinConvertError diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index eb9480b..a9f5ab4 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclStubInit.c,v 1.73 2002/07/17 18:21:55 msofer Exp $ + * RCS: @(#) $Id: tclStubInit.c,v 1.74 2002/08/06 01:49:27 das Exp $ */ #include "tclInt.h" @@ -267,6 +267,10 @@ TclIntPlatStubs tclIntPlatStubs = { TclpOpenFile, /* 7 */ TclUnixWaitForFile, /* 8 */ TclpCreateTempFile, /* 9 */ + TclpReaddir, /* 10 */ + TclpLocaltime, /* 11 */ + TclpGmtime, /* 12 */ + TclpInetNtoa, /* 13 */ #endif /* UNIX */ #ifdef __WIN32__ TclWinConvertError, /* 0 */ |