Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | tclStubInit.c: move up #undef, so it is clear that this macro is conflicting with another definition in this file. Fix some other gcc warnings |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | core-8-4-branch |
Files: | files | file ages | folders |
SHA1: |
206b9b100a88c7afb2091f3cf74c5110 |
User & Date: | jan.nijtmans 2012-04-04 18:52:18 |
Context
2012-04-11
| ||
19:19 | [Bug 3448512]: clock scan "1958-01-01" fails only in debug compilation check-in: 03c30e0b9e user: jan.nijtmans tags: core-8-4-branch | |
2012-04-04
| ||
20:17 | some formatting (*.decls) move up #undef, for macro which is conflicting with later stuff. remove so... check-in: 904f4fe3fe user: jan.nijtmans tags: core-8-5-branch | |
18:52 | tclStubInit.c: move up #undef, so it is clear that this macro is conflicting with another definition... check-in: 206b9b100a user: jan.nijtmans tags: core-8-4-branch | |
14:44 | Quick workaround for busted branch tip. check-in: 2372607d3e user: dgp tags: core-8-4-branch | |
Changes
Changes to generic/tclEnv.c.
︙ | ︙ | |||
44 45 46 47 48 49 50 | Tcl_Interp *interp, CONST char *name1, CONST char *name2, int flags)); static void ReplaceString _ANSI_ARGS_((CONST char *oldStr, char *newStr)); void TclSetEnv _ANSI_ARGS_((CONST char *name, CONST char *value)); void TclUnsetEnv _ANSI_ARGS_((CONST char *name)); | < < < < | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | Tcl_Interp *interp, CONST char *name1, CONST char *name2, int flags)); static void ReplaceString _ANSI_ARGS_((CONST char *oldStr, char *newStr)); void TclSetEnv _ANSI_ARGS_((CONST char *name, CONST char *value)); void TclUnsetEnv _ANSI_ARGS_((CONST char *name)); /* *---------------------------------------------------------------------- * * TclSetupEnv -- * * This procedure is invoked for an interpreter to make environment |
︙ | ︙ |
Changes to generic/tclIOUtil.c.
︙ | ︙ | |||
6286 6287 6288 6289 6290 6291 6292 | } } Tcl_DStringFree(&temp); } else { transPtr = Tcl_FSJoinToPath(objPtr,0,NULL); } | < < < < < < < < < < < < < < < < < < < < | 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 6299 | } } Tcl_DStringFree(&temp); } else { transPtr = Tcl_FSJoinToPath(objPtr,0,NULL); } /* * Now we have a translated filename in 'transPtr'. This will have * forward slashes on Windows, and will not contain any ~user * sequences. */ fsPathPtr = (FsPath*)ckalloc((unsigned)sizeof(FsPath)); |
︙ | ︙ |
Changes to generic/tclStubInit.c.
︙ | ︙ | |||
27 28 29 30 31 32 33 34 35 36 37 38 39 40 | #undef Tcl_NewLongObj #undef Tcl_NewObj #undef Tcl_NewStringObj #undef Tcl_DumpActiveMemory #undef Tcl_ValidateAllMemory #undef Tcl_FindHashEntry #undef Tcl_CreateHashEntry /* * Keep a record of the original Notifier procedures, created in the * same compilation unit as the stub tables so we can later do reliable, * portable comparisons to see whether a Tcl_SetNotifier() call swapped * new routines into the stub table. */ | > | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | #undef Tcl_NewLongObj #undef Tcl_NewObj #undef Tcl_NewStringObj #undef Tcl_DumpActiveMemory #undef Tcl_ValidateAllMemory #undef Tcl_FindHashEntry #undef Tcl_CreateHashEntry #undef TclSockMinimumBuffers /* * Keep a record of the original Notifier procedures, created in the * same compilation unit as the stub tables so we can later do reliable, * portable comparisons to see whether a Tcl_SetNotifier() call swapped * new routines into the stub table. */ |
︙ | ︙ | |||
55 56 57 58 59 60 61 | NULL }; /* See bug 510001: TclSockMinimumBuffers needs plat imp */ #ifdef _WIN64 # define TclSockMinimumBuffersOld 0 #else | < | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | NULL }; /* See bug 510001: TclSockMinimumBuffers needs plat imp */ #ifdef _WIN64 # define TclSockMinimumBuffersOld 0 #else int TclSockMinimumBuffersOld(sock, size) int sock; int size; { return TclSockMinimumBuffers((void *) (size_t) sock, size); } #endif |
︙ | ︙ |
Changes to win/tclWinFile.c.
︙ | ︙ | |||
219 220 221 222 223 224 225 | /* Invalid file */ TclWinConvertError(GetLastError()); return -1; } /* Make sure source file doesn't exist */ attr = (*tclWinProcs->getFileAttributesProc)(LinkSource); | | | | 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 | /* Invalid file */ TclWinConvertError(GetLastError()); return -1; } /* Make sure source file doesn't exist */ attr = (*tclWinProcs->getFileAttributesProc)(LinkSource); if (attr != -1) { Tcl_SetErrno(EEXIST); return -1; } /* Get the full path referenced by the directory */ if (!(*tclWinProcs->getFullPathNameProc)(LinkSource, MAX_PATH, tempFileName, &tempFilePart)) { /* Invalid file */ TclWinConvertError(GetLastError()); return -1; } /* Check the target */ attr = (*tclWinProcs->getFileAttributesProc)(LinkTarget); if (attr == -1) { /* The target doesn't exist */ TclWinConvertError(GetLastError()); return -1; } else if ((attr & FILE_ATTRIBUTE_DIRECTORY) == 0) { /* It is a file */ if (tclWinProcs->createHardLinkProc == NULL) { Tcl_SetErrno(ENOTDIR); |
︙ | ︙ | |||
297 298 299 300 301 302 303 | /* Invalid file */ TclWinConvertError(GetLastError()); return NULL; } /* Make sure source file does exist */ attr = (*tclWinProcs->getFileAttributesProc)(LinkSource); | | | 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 | /* Invalid file */ TclWinConvertError(GetLastError()); return NULL; } /* Make sure source file does exist */ attr = (*tclWinProcs->getFileAttributesProc)(LinkSource); if (attr == -1) { /* The source doesn't exist */ TclWinConvertError(GetLastError()); return NULL; } else if ((attr & FILE_ATTRIBUTE_DIRECTORY) == 0) { /* It is a file - this is not yet supported */ Tcl_SetErrno(ENOTDIR); return NULL; |
︙ | ︙ |