Tcl Source Code

Check-in [4929c1bb0f]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2018 Conference, Houston/TX, US, Oct 15-19
Send your abstracts to tclconference@googlegroups.com
or submit via the online form by Aug 20.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:merge 8.5
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-6-branch
Files: files | file ages | folders
SHA3-256:4929c1bb0f6d1d705f47163e98e2293aa7e2667fec3a4a5c1423206c7bdeceac
User & Date: jan.nijtmans 2018-05-14 19:16:24
Context
2018-05-24
20:36
merge 8.5, conflicts resolved (rewritten without winapi-stubs) check-in: cf1f3f3748 user: sebres tags: core-8-6-branch
2018-05-18
06:18
Add test filesystem-1.30.1 checking file normalize ~$::tcl_platform(user). This test should currentl... check-in: ffd0f31dba user: fvogel tags: bug-9e6b569963
2018-05-14
19:16
merge 8.6 check-in: c9567c991f user: jan.nijtmans tags: core-8-branch
19:16
merge 8.5 check-in: 4929c1bb0f user: jan.nijtmans tags: core-8-6-branch
19:14
Unbreak build when HAVE_FTS is not set. Move definitions of Tcl_DirEntry and TclDIR to tclWinPort.h... check-in: 7bc44a586a user: jan.nijtmans tags: core-8-5-branch
2018-05-11
09:20
Merge 8.5. This adds Emoji 11.0 support, when Tcl is compiled with TCL_UTF_MAX>3. Useful for Androwi... check-in: 708287d936 user: jan.nijtmans tags: core-8-6-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tclIntPlatDecls.h.

9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
 * Copyright (c) 1998-1999 by Scriptics Corporation.
 * All rights reserved.
 */

#ifndef _TCLINTPLATDECLS
#define _TCLINTPLATDECLS

#ifdef _WIN32
#   define Tcl_DirEntry void
#   define TclDIR void
#endif

#undef TCL_STORAGE_CLASS
#ifdef BUILD_tcl
#   define TCL_STORAGE_CLASS DLLEXPORT
#else
#   ifdef USE_TCL_STUBS
#      define TCL_STORAGE_CLASS
#   else







<
<
<
<
<







9
10
11
12
13
14
15





16
17
18
19
20
21
22
 * Copyright (c) 1998-1999 by Scriptics Corporation.
 * All rights reserved.
 */

#ifndef _TCLINTPLATDECLS
#define _TCLINTPLATDECLS






#undef TCL_STORAGE_CLASS
#ifdef BUILD_tcl
#   define TCL_STORAGE_CLASS DLLEXPORT
#else
#   ifdef USE_TCL_STUBS
#      define TCL_STORAGE_CLASS
#   else

Changes to unix/tclUnixFCmd.c.

961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
    Tcl_StatBuf statBuf;
    const char *source, *errfile;
    int result, sourceLen;
    int targetLen;
#ifndef HAVE_FTS
    int numProcessed = 0;
    Tcl_DirEntry *dirEntPtr;
    Tcl_Dir *dirPtr;
#else
    const char *paths[2] = {NULL, NULL};
    FTS *fts = NULL;
    FTSENT *ent;
#endif

    errfile = NULL;







|







961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
    Tcl_StatBuf statBuf;
    const char *source, *errfile;
    int result, sourceLen;
    int targetLen;
#ifndef HAVE_FTS
    int numProcessed = 0;
    Tcl_DirEntry *dirEntPtr;
    TclDIR *dirPtr;
#else
    const char *paths[2] = {NULL, NULL};
    FTS *fts = NULL;
    FTSENT *ent;
#endif

    errfile = NULL;

Changes to win/tclWinPort.h.

563
564
565
566
567
568
569
570



571
#ifndef INVALID_SET_FILE_POINTER
#define INVALID_SET_FILE_POINTER 0xFFFFFFFF
#endif /* INVALID_SET_FILE_POINTER */

#ifndef LABEL_SECURITY_INFORMATION
#   define LABEL_SECURITY_INFORMATION (0x00000010L)
#endif




#endif /* _TCLWINPORT */








>
>
>

563
564
565
566
567
568
569
570
571
572
573
574
#ifndef INVALID_SET_FILE_POINTER
#define INVALID_SET_FILE_POINTER 0xFFFFFFFF
#endif /* INVALID_SET_FILE_POINTER */

#ifndef LABEL_SECURITY_INFORMATION
#   define LABEL_SECURITY_INFORMATION (0x00000010L)
#endif

#define Tcl_DirEntry void
#define TclDIR void

#endif /* _TCLWINPORT */