summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/tcl.decls4
-rw-r--r--generic/tclDecls.h10
-rw-r--r--generic/tclInt.decls2
-rw-r--r--generic/tclIntDecls.h192
-rw-r--r--generic/tclIntPlatDecls.h18
-rw-r--r--generic/tclStubInit.c2
-rw-r--r--tools/genStubs.tcl2
-rw-r--r--unix/tclUnixTime.c28
8 files changed, 121 insertions, 137 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls
index e1093e6..b33e808 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -1093,11 +1093,11 @@ declare 303 generic {
}
declare 304 generic {
int Tcl_GetIndexFromObjStruct(Tcl_Interp *interp, Tcl_Obj *objPtr,
- CONST VOID *tablePtr, int offset, CONST char *msg, int flags,
+ CONST void *tablePtr, int offset, CONST char *msg, int flags,
int *indexPtr)
}
declare 305 generic {
- VOID *Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr, int size)
+ void *Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr, int size)
}
declare 306 generic {
Tcl_Obj *Tcl_GetVar2Ex(Tcl_Interp *interp, CONST char *part1,
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 46e90ad..b741475 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3432,7 +3432,7 @@ typedef struct TclStubs {
void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, ClientData clientData); /* 9 */
#endif /* UNIX */
#ifdef __WIN32__ /* WIN */
- void *reserved9;
+ VOID *reserved9;
#endif /* WIN */
#ifdef MAC_OSX_TCL /* MACOSX */
void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, ClientData clientData); /* 9 */
@@ -3441,7 +3441,7 @@ typedef struct TclStubs {
void (*tcl_DeleteFileHandler) (int fd); /* 10 */
#endif /* UNIX */
#ifdef __WIN32__ /* WIN */
- void *reserved10;
+ VOID *reserved10;
#endif /* WIN */
#ifdef MAC_OSX_TCL /* MACOSX */
void (*tcl_DeleteFileHandler) (int fd); /* 10 */
@@ -3606,7 +3606,7 @@ typedef struct TclStubs {
int (*tcl_GetOpenFile) (Tcl_Interp *interp, CONST char *chanID, int forWriting, int checkUsage, ClientData *filePtr); /* 167 */
#endif /* UNIX */
#ifdef __WIN32__ /* WIN */
- void *reserved167;
+ VOID *reserved167;
#endif /* WIN */
#ifdef MAC_OSX_TCL /* MACOSX */
int (*tcl_GetOpenFile) (Tcl_Interp *interp, CONST char *chanID, int forWriting, int checkUsage, ClientData *filePtr); /* 167 */
@@ -3631,7 +3631,7 @@ typedef struct TclStubs {
int (*tcl_IsSafe) (Tcl_Interp *interp); /* 185 */
char * (*tcl_JoinPath) (int argc, CONST84 char *CONST *argv, Tcl_DString *resultPtr); /* 186 */
int (*tcl_LinkVar) (Tcl_Interp *interp, CONST char *varName, char *addr, int type); /* 187 */
- void *reserved188;
+ VOID *reserved188;
Tcl_Channel (*tcl_MakeFileChannel) (ClientData handle, int mode); /* 189 */
int (*tcl_MakeSafe) (Tcl_Interp *interp); /* 190 */
Tcl_Channel (*tcl_MakeTcpClientChannel) (ClientData tcpSocket); /* 191 */
@@ -3728,7 +3728,7 @@ typedef struct TclStubs {
int (*tcl_UnstackChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 282 */
Tcl_Channel (*tcl_GetStackedChannel) (Tcl_Channel chan); /* 283 */
void (*tcl_SetMainLoop) (Tcl_MainLoopProc *proc); /* 284 */
- void *reserved285;
+ VOID *reserved285;
void (*tcl_AppendObjToObj) (Tcl_Obj *objPtr, Tcl_Obj *appendObjPtr); /* 286 */
Tcl_Encoding (*tcl_CreateEncoding) (CONST Tcl_EncodingType *typePtr); /* 287 */
void (*tcl_CreateThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 288 */
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 6d63164..e30379e 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -576,7 +576,7 @@ declare 145 generic {
struct AuxDataType *TclGetAuxDataType(char *typeName)
}
declare 146 generic {
- TclHandle TclHandleCreate(VOID *ptr)
+ TclHandle TclHandleCreate(void *ptr)
}
declare 147 generic {
void TclHandleFree(TclHandle handle)
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 3bf181f..fb63ec0 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -1054,11 +1054,11 @@ typedef struct TclIntStubs {
int magic;
struct TclIntStubHooks *hooks;
- void *reserved0;
- void *reserved1;
- void *reserved2;
+ VOID *reserved0;
+ VOID *reserved1;
+ VOID *reserved2;
void (*tclAllocateFreeObjects) (void); /* 3 */
- void *reserved4;
+ VOID *reserved4;
int (*tclCleanupChildren) (Tcl_Interp *interp, int numPids, Tcl_Pid *pidPtr, Tcl_Channel errorChan); /* 5 */
void (*tclCleanupCommand) (Command *cmdPtr); /* 6 */
int (*tclCopyAndCollapse) (int count, CONST char *src, char *dst); /* 7 */
@@ -1067,29 +1067,29 @@ typedef struct TclIntStubs {
int (*tclCreateProc) (Tcl_Interp *interp, Namespace *nsPtr, CONST char *procName, Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr, Proc **procPtrPtr); /* 10 */
void (*tclDeleteCompiledLocalVars) (Interp *iPtr, CallFrame *framePtr); /* 11 */
void (*tclDeleteVars) (Interp *iPtr, TclVarHashTable *tablePtr); /* 12 */
- void *reserved13;
+ VOID *reserved13;
int (*tclDumpMemoryInfo) (ClientData clientData, int flags); /* 14 */
- void *reserved15;
+ VOID *reserved15;
void (*tclExprFloatError) (Tcl_Interp *interp, double value); /* 16 */
- void *reserved17;
- void *reserved18;
- void *reserved19;
- void *reserved20;
- void *reserved21;
+ VOID *reserved17;
+ VOID *reserved18;
+ VOID *reserved19;
+ VOID *reserved20;
+ VOID *reserved21;
int (*tclFindElement) (Tcl_Interp *interp, CONST char *listStr, int listLength, CONST char **elementPtr, CONST char **nextPtr, int *sizePtr, int *bracePtr); /* 22 */
Proc * (*tclFindProc) (Interp *iPtr, CONST char *procName); /* 23 */
int (*tclFormatInt) (char *buffer, long n); /* 24 */
void (*tclFreePackageInfo) (Interp *iPtr); /* 25 */
- void *reserved26;
- void *reserved27;
+ VOID *reserved26;
+ VOID *reserved27;
Tcl_Channel (*tclpGetDefaultStdChannel) (int type); /* 28 */
- void *reserved29;
- void *reserved30;
+ VOID *reserved29;
+ VOID *reserved30;
CONST char * (*tclGetExtension) (CONST char *name); /* 31 */
int (*tclGetFrame) (Tcl_Interp *interp, CONST char *str, CallFrame **framePtrPtr); /* 32 */
- void *reserved33;
+ VOID *reserved33;
int (*tclGetIntForIndex) (Tcl_Interp *interp, Tcl_Obj *objPtr, int endValue, int *indexPtr); /* 34 */
- void *reserved35;
+ VOID *reserved35;
int (*tclGetLong) (Tcl_Interp *interp, CONST char *str, long *longPtr); /* 36 */
int (*tclGetLoadedPackages) (Tcl_Interp *interp, char *targetName); /* 37 */
int (*tclGetNamespaceForQualName) (Tcl_Interp *interp, CONST char *qualName, Namespace *cxtNsPtr, int flags, Namespace **nsPtrPtr, Namespace **altNsPtrPtr, Namespace **actualCxtPtrPtr, CONST char **simpleNamePtr); /* 38 */
@@ -1097,74 +1097,74 @@ typedef struct TclIntStubs {
int (*tclGetOpenMode) (Tcl_Interp *interp, CONST char *str, int *seekFlagPtr); /* 40 */
Tcl_Command (*tclGetOriginalCommand) (Tcl_Command command); /* 41 */
char * (*tclpGetUserHome) (CONST char *name, Tcl_DString *bufferPtr); /* 42 */
- void *reserved43;
+ VOID *reserved43;
int (*tclGuessPackageName) (CONST char *fileName, Tcl_DString *bufPtr); /* 44 */
int (*tclHideUnsafeCommands) (Tcl_Interp *interp); /* 45 */
int (*tclInExit) (void); /* 46 */
- void *reserved47;
- void *reserved48;
- void *reserved49;
+ VOID *reserved47;
+ VOID *reserved48;
+ VOID *reserved49;
void (*tclInitCompiledLocals) (Tcl_Interp *interp, CallFrame *framePtr, Namespace *nsPtr); /* 50 */
int (*tclInterpInit) (Tcl_Interp *interp); /* 51 */
- void *reserved52;
+ VOID *reserved52;
int (*tclInvokeObjectCommand) (ClientData clientData, Tcl_Interp *interp, int argc, CONST84 char **argv); /* 53 */
int (*tclInvokeStringCommand) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); /* 54 */
Proc * (*tclIsProc) (Command *cmdPtr); /* 55 */
- void *reserved56;
- void *reserved57;
+ VOID *reserved56;
+ VOID *reserved57;
Var * (*tclLookupVar) (Tcl_Interp *interp, CONST char *part1, CONST char *part2, int flags, CONST char *msg, int createPart1, int createPart2, Var **arrayPtrPtr); /* 58 */
- void *reserved59;
+ VOID *reserved59;
int (*tclNeedSpace) (CONST char *start, CONST char *end); /* 60 */
Tcl_Obj * (*tclNewProcBodyObj) (Proc *procPtr); /* 61 */
int (*tclObjCommandComplete) (Tcl_Obj *cmdPtr); /* 62 */
int (*tclObjInterpProc) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); /* 63 */
int (*tclObjInvoke) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], int flags); /* 64 */
- void *reserved65;
- void *reserved66;
- void *reserved67;
- void *reserved68;
+ VOID *reserved65;
+ VOID *reserved66;
+ VOID *reserved67;
+ VOID *reserved68;
char * (*tclpAlloc) (unsigned int size); /* 69 */
- void *reserved70;
- void *reserved71;
- void *reserved72;
- void *reserved73;
+ VOID *reserved70;
+ VOID *reserved71;
+ VOID *reserved72;
+ VOID *reserved73;
void (*tclpFree) (char *ptr); /* 74 */
unsigned long (*tclpGetClicks) (void); /* 75 */
unsigned long (*tclpGetSeconds) (void); /* 76 */
void (*tclpGetTime) (Tcl_Time *time); /* 77 */
int (*tclpGetTimeZone) (unsigned long time); /* 78 */
- void *reserved79;
- void *reserved80;
+ VOID *reserved79;
+ VOID *reserved80;
char * (*tclpRealloc) (char *ptr, unsigned int size); /* 81 */
- void *reserved82;
- void *reserved83;
- void *reserved84;
- void *reserved85;
- void *reserved86;
- void *reserved87;
+ VOID *reserved82;
+ VOID *reserved83;
+ VOID *reserved84;
+ VOID *reserved85;
+ VOID *reserved86;
+ VOID *reserved87;
char * (*tclPrecTraceProc) (ClientData clientData, Tcl_Interp *interp, CONST char *name1, CONST char *name2, int flags); /* 88 */
int (*tclPreventAliasLoop) (Tcl_Interp *interp, Tcl_Interp *cmdInterp, Tcl_Command cmd); /* 89 */
- void *reserved90;
+ VOID *reserved90;
void (*tclProcCleanupProc) (Proc *procPtr); /* 91 */
int (*tclProcCompileProc) (Tcl_Interp *interp, Proc *procPtr, Tcl_Obj *bodyPtr, Namespace *nsPtr, CONST char *description, CONST char *procName); /* 92 */
void (*tclProcDeleteProc) (ClientData clientData); /* 93 */
- void *reserved94;
- void *reserved95;
+ VOID *reserved94;
+ VOID *reserved95;
int (*tclRenameCommand) (Tcl_Interp *interp, CONST char *oldName, CONST char *newName); /* 96 */
void (*tclResetShadowedCmdRefs) (Tcl_Interp *interp, Command *newCmdPtr); /* 97 */
int (*tclServiceIdle) (void); /* 98 */
- void *reserved99;
- void *reserved100;
+ VOID *reserved99;
+ VOID *reserved100;
char * (*tclSetPreInitScript) (char *string); /* 101 */
void (*tclSetupEnv) (Tcl_Interp *interp); /* 102 */
int (*tclSockGetPort) (Tcl_Interp *interp, CONST char *str, CONST char *proto, int *portPtr); /* 103 */
int (*tclSockMinimumBuffers) (int sock, int size); /* 104 */
- void *reserved105;
- void *reserved106;
- void *reserved107;
+ VOID *reserved105;
+ VOID *reserved106;
+ VOID *reserved107;
void (*tclTeardownNamespace) (Namespace *nsPtr); /* 108 */
int (*tclUpdateReturnInfo) (Interp *iPtr); /* 109 */
- void *reserved110;
+ VOID *reserved110;
void (*tcl_AddInterpResolvers) (Tcl_Interp *interp, CONST char *name, Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, Tcl_ResolveCompiledVarProc *compiledVarProc); /* 111 */
int (*tcl_AppendExportList) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *objPtr); /* 112 */
Tcl_Namespace * (*tcl_CreateNamespace) (Tcl_Interp *interp, CONST char *name, ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc); /* 113 */
@@ -1188,13 +1188,13 @@ typedef struct TclIntStubs {
void (*tcl_SetNamespaceResolvers) (Tcl_Namespace *namespacePtr, Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, Tcl_ResolveCompiledVarProc *compiledVarProc); /* 131 */
int (*tclpHasSockets) (Tcl_Interp *interp); /* 132 */
struct tm * (*tclpGetDate) (CONST time_t *time, int useGMT); /* 133 */
- void *reserved134;
- void *reserved135;
- void *reserved136;
- void *reserved137;
+ VOID *reserved134;
+ VOID *reserved135;
+ VOID *reserved136;
+ VOID *reserved137;
CONST84_RETURN char * (*tclGetEnv) (CONST char *name, Tcl_DString *valuePtr); /* 138 */
- void *reserved139;
- void *reserved140;
+ VOID *reserved139;
+ VOID *reserved140;
CONST84_RETURN char * (*tclpGetCwd) (Tcl_Interp *interp, Tcl_DString *cwdPtr); /* 141 */
int (*tclSetByteCodeFromAny) (Tcl_Interp *interp, Tcl_Obj *objPtr, CompileHookProc *hookProc, ClientData clientData); /* 142 */
int (*tclAddLiteralObj) (struct CompileEnv *envPtr, Tcl_Obj *objPtr, LiteralEntry **litPtrPtr); /* 143 */
@@ -1208,13 +1208,13 @@ typedef struct TclIntStubs {
void (*tclRegExpRangeUniChar) (Tcl_RegExp re, int index, int *startPtr, int *endPtr); /* 151 */
void (*tclSetLibraryPath) (Tcl_Obj *pathPtr); /* 152 */
Tcl_Obj * (*tclGetLibraryPath) (void); /* 153 */
- void *reserved154;
- void *reserved155;
+ VOID *reserved154;
+ VOID *reserved155;
void (*tclRegError) (Tcl_Interp *interp, CONST char *msg, int status); /* 156 */
Var * (*tclVarTraceExists) (Tcl_Interp *interp, CONST char *varName); /* 157 */
void (*tclSetStartupScriptFileName) (CONST char *filename); /* 158 */
CONST84_RETURN char * (*tclGetStartupScriptFileName) (void); /* 159 */
- void *reserved160;
+ VOID *reserved160;
int (*tclChannelTransform) (Tcl_Interp *interp, Tcl_Channel chan, Tcl_Obj *cmdObjPtr); /* 161 */
void (*tclChannelEventScriptInvoker) (ClientData clientData, int flags); /* 162 */
VOID * (*tclGetInstructionTable) (void); /* 163 */
@@ -1228,32 +1228,32 @@ typedef struct TclIntStubs {
int (*tclCheckExecutionTraces) (Tcl_Interp *interp, CONST char *command, int numChars, Command *cmdPtr, int result, int traceFlags, int objc, Tcl_Obj *CONST objv[]); /* 171 */
int (*tclInThreadExit) (void); /* 172 */
int (*tclUniCharMatch) (CONST Tcl_UniChar *string, int strLen, CONST Tcl_UniChar *pattern, int ptnLen, int flags); /* 173 */
- void *reserved174;
+ VOID *reserved174;
int (*tclCallVarTraces) (Interp *iPtr, Var *arrayPtr, Var *varPtr, CONST char *part1, CONST char *part2, int flags, int leaveErrMsg); /* 175 */
void (*tclCleanupVar) (Var *varPtr, Var *arrayPtr); /* 176 */
void (*tclVarErrMsg) (Tcl_Interp *interp, CONST char *part1, CONST char *part2, CONST char *operation, CONST char *reason); /* 177 */
void (*tcl_SetStartupScript) (Tcl_Obj *pathPtr, CONST char*encodingName); /* 178 */
Tcl_Obj * (*tcl_GetStartupScript) (CONST char **encodingNamePtr); /* 179 */
- void *reserved180;
- void *reserved181;
+ VOID *reserved180;
+ VOID *reserved181;
struct tm * (*tclpLocaltime) (CONST time_t *clock); /* 182 */
struct tm * (*tclpGmtime) (CONST time_t *clock); /* 183 */
- void *reserved184;
- void *reserved185;
- void *reserved186;
- void *reserved187;
- void *reserved188;
- void *reserved189;
- void *reserved190;
- void *reserved191;
- void *reserved192;
- void *reserved193;
- void *reserved194;
- void *reserved195;
- void *reserved196;
- void *reserved197;
+ VOID *reserved184;
+ VOID *reserved185;
+ VOID *reserved186;
+ VOID *reserved187;
+ VOID *reserved188;
+ VOID *reserved189;
+ VOID *reserved190;
+ VOID *reserved191;
+ VOID *reserved192;
+ VOID *reserved193;
+ VOID *reserved194;
+ VOID *reserved195;
+ VOID *reserved196;
+ VOID *reserved197;
int (*tclObjGetFrame) (Tcl_Interp *interp, Tcl_Obj *objPtr, CallFrame **framePtrPtr); /* 198 */
- void *reserved199;
+ VOID *reserved199;
int (*tclpObjRemoveDirectory) (Tcl_Obj *pathPtr, int recursive, Tcl_Obj **errorPtr); /* 200 */
int (*tclpObjCopyDirectory) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr); /* 201 */
int (*tclpObjCreateDirectory) (Tcl_Obj *pathPtr); /* 202 */
@@ -1263,9 +1263,9 @@ typedef struct TclIntStubs {
int (*tclpObjStat) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf); /* 206 */
int (*tclpObjAccess) (Tcl_Obj *pathPtr, int mode); /* 207 */
Tcl_Channel (*tclpOpenFileChannel) (Tcl_Interp *interp, Tcl_Obj *pathPtr, int mode, int permissions); /* 208 */
- void *reserved209;
- void *reserved210;
- void *reserved211;
+ VOID *reserved209;
+ VOID *reserved210;
+ VOID *reserved211;
void (*tclpFindExecutable) (CONST char *argv0); /* 212 */
Tcl_Obj * (*tclGetObjNameOfExecutable) (void); /* 213 */
void (*tclSetObjNameOfExecutable) (Tcl_Obj *name, Tcl_Encoding encoding); /* 214 */
@@ -1273,11 +1273,11 @@ typedef struct TclIntStubs {
void (*tclStackFree) (Tcl_Interp *interp, VOID *freePtr); /* 216 */
int (*tclPushStackFrame) (Tcl_Interp *interp, Tcl_CallFrame **framePtrPtr, Tcl_Namespace *namespacePtr, int isProcCallFrame); /* 217 */
void (*tclPopStackFrame) (Tcl_Interp *interp); /* 218 */
- void *reserved219;
- void *reserved220;
- void *reserved221;
- void *reserved222;
- void *reserved223;
+ VOID *reserved219;
+ VOID *reserved220;
+ VOID *reserved221;
+ VOID *reserved222;
+ VOID *reserved223;
TclPlatformType * (*tclGetPlatform) (void); /* 224 */
Tcl_Obj * (*tclTraceDictPath) (Tcl_Interp *interp, Tcl_Obj *rootPtr, int keyc, Tcl_Obj *CONST keyv[], int flags); /* 225 */
int (*tclObjBeingDeleted) (Tcl_Obj *objPtr); /* 226 */
@@ -1291,18 +1291,18 @@ typedef struct TclIntStubs {
Var * (*tclVarHashCreateVar) (TclVarHashTable *tablePtr, CONST char *key, int *newPtr); /* 234 */
void (*tclInitVarHashTable) (TclVarHashTable *tablePtr, Namespace *nsPtr); /* 235 */
void (*tclBackgroundException) (Tcl_Interp *interp, int code); /* 236 */
- void *reserved237;
- void *reserved238;
- void *reserved239;
- void *reserved240;
- void *reserved241;
- void *reserved242;
+ VOID *reserved237;
+ VOID *reserved238;
+ VOID *reserved239;
+ VOID *reserved240;
+ VOID *reserved241;
+ VOID *reserved242;
void (*tclDbDumpActiveObjects) (FILE *outFile); /* 243 */
- void *reserved244;
- void *reserved245;
- void *reserved246;
- void *reserved247;
- void *reserved248;
+ VOID *reserved244;
+ VOID *reserved245;
+ VOID *reserved246;
+ VOID *reserved247;
+ VOID *reserved248;
char* (*tclDoubleDigits) (double dv, int ndigits, int flags, int*decpt, int*signum, char**endPtr); /* 249 */
} TclIntStubs;
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index c616671..3c03015 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -381,7 +381,7 @@ typedef struct TclIntPlatStubs {
Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr); /* 2 */
int (*tclpCreatePipe) (TclFile *readPipe, TclFile *writePipe); /* 3 */
int (*tclpCreateProcess) (Tcl_Interp *interp, int argc, CONST char **argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid *pidPtr); /* 4 */
- void *reserved5;
+ VOID *reserved5;
TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 6 */
TclFile (*tclpOpenFile) (CONST char *fname, int mode); /* 7 */
int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 8 */
@@ -398,27 +398,27 @@ typedef struct TclIntPlatStubs {
struct servent * (*tclWinGetServByName) (CONST char *nm, CONST char *proto); /* 2 */
int (*tclWinGetSockOpt) (int s, int level, int optname, char FAR *optval, int FAR *optlen); /* 3 */
HINSTANCE (*tclWinGetTclInstance) (void); /* 4 */
- void *reserved5;
+ VOID *reserved5;
u_short (*tclWinNToHS) (u_short ns); /* 6 */
int (*tclWinSetSockOpt) (int s, int level, int optname, CONST char FAR *optval, int optlen); /* 7 */
unsigned long (*tclpGetPid) (Tcl_Pid pid); /* 8 */
int (*tclWinGetPlatformId) (void); /* 9 */
- void *reserved10;
+ VOID *reserved10;
void (*tclGetAndDetachPids) (Tcl_Interp *interp, Tcl_Channel chan); /* 11 */
int (*tclpCloseFile) (TclFile file); /* 12 */
Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr); /* 13 */
int (*tclpCreatePipe) (TclFile *readPipe, TclFile *writePipe); /* 14 */
int (*tclpCreateProcess) (Tcl_Interp *interp, int argc, CONST char **argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid *pidPtr); /* 15 */
- void *reserved16;
- void *reserved17;
+ VOID *reserved16;
+ VOID *reserved17;
TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 18 */
TclFile (*tclpOpenFile) (CONST char *fname, int mode); /* 19 */
void (*tclWinAddProcess) (VOID *hProcess, unsigned long id); /* 20 */
- void *reserved21;
+ VOID *reserved21;
TclFile (*tclpCreateTempFile) (CONST char *contents); /* 22 */
char * (*tclpGetTZName) (int isdst); /* 23 */
char * (*tclWinNoBackslash) (char *path); /* 24 */
- void *reserved25;
+ VOID *reserved25;
void (*tclWinSetInterfaces) (int wide); /* 26 */
void (*tclWinFlushDirtyChannels) (void); /* 27 */
void (*tclWinResetInterfaces) (void); /* 28 */
@@ -430,7 +430,7 @@ typedef struct TclIntPlatStubs {
Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr); /* 2 */
int (*tclpCreatePipe) (TclFile *readPipe, TclFile *writePipe); /* 3 */
int (*tclpCreateProcess) (Tcl_Interp *interp, int argc, CONST char **argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid *pidPtr); /* 4 */
- void *reserved5;
+ VOID *reserved5;
TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 6 */
TclFile (*tclpOpenFile) (CONST char *fname, int mode); /* 7 */
int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 8 */
@@ -711,5 +711,7 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr;
#undef TCL_STORAGE_CLASS
#define TCL_STORAGE_CLASS DLLIMPORT
+#undef TclpLocaltime_unix
+#undef TclpGmtime_unix
#endif /* _TCLINTPLATDECLS */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 520847a..bc29ee6 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -31,6 +31,8 @@
#undef Tcl_ValidateAllMemory
#undef Tcl_FindHashEntry
#undef Tcl_CreateHashEntry
+#define TclpLocaltime_unix TclpLocaltime
+#define TclpGmtime_unix TclpGmtime
/*
* Keep a record of the original Notifier procedures, created in the
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 01ae467..464ba50 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -304,7 +304,7 @@ proc genStubs::addPlatformGuard {plat iftxt {eltxt {}}} {
proc genStubs::emitSlots {name textVar} {
upvar $textVar text
- forAllStubs $name makeSlot 1 text {" void *reserved$i;\n"}
+ forAllStubs $name makeSlot 1 text {" VOID *reserved$i;\n"}
return
}
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index cf730a2..b98f2e1 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -62,7 +62,7 @@ Tcl_ScaleTimeProc *tclScaleTimeProcPtr = NativeScaleTime;
ClientData tclTimeClientData = NULL;
/*
- *-----------------------------------------------------------------------------
+ *----------------------------------------------------------------------
*
* TclpGetSeconds --
*
@@ -75,7 +75,7 @@ ClientData tclTimeClientData = NULL;
* Side effects:
* None.
*
- *-----------------------------------------------------------------------------
+ *----------------------------------------------------------------------
*/
unsigned long
@@ -85,7 +85,7 @@ TclpGetSeconds(void)
}
/*
- *-----------------------------------------------------------------------------
+ *----------------------------------------------------------------------
*
* TclpGetClicks --
*
@@ -100,7 +100,7 @@ TclpGetSeconds(void)
* Side effects:
* None.
*
- *-----------------------------------------------------------------------------
+ *----------------------------------------------------------------------
*/
unsigned long
@@ -431,17 +431,6 @@ TclpGmtime(
return &(tsdPtr->gmtime_buf);
}
-
-/*
- * Forwarder for obsolete item in Stubs
- */
-
-struct tm *
-TclpGmtime_unix(
- CONST time_t *timePtr)
-{
- return TclpGmtime(timePtr);
-}
/*
*----------------------------------------------------------------------
@@ -482,15 +471,6 @@ TclpLocaltime(
return &(tsdPtr->localtime_buf);
}
-/*
- * Forwarder for obsolete item in Stubs
- */
-struct tm*
-TclpLocaltime_unix(
- CONST time_t *timePtr)
-{
- return TclpLocaltime(timePtr);
-}
/*
*----------------------------------------------------------------------
generated by cgit v0.12 at 2024-07-07 15:11:09 (GMT)