Tcl Source Code

Check-in [ca02a64d68]
Login

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

Overview
Comment:fix merge error
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: ca02a64d681a75b49744fbd6d01c5216842ead74
User & Date: jan.nijtmans 2012-04-24 21:50:55
Context
2012-04-25
12:07
* generic/tclUtil.c (TclDStringToObj): Added internal function to make the fairly-common operation...
check-in: 2e12143e39 user: dkf tags: trunk
2012-04-24
21:50
fix merge error check-in: ca02a64d68 user: jan.nijtmans tags: trunk
21:29
[Bug 3508771] load tclreg.dll in cygwin tclsh Implement TclWinGetSockOpt, TclWinGetServByName and Tc... check-in: 3caedf05df user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tclIntPlatDecls.h.

634
635
636
637
638
639
640


641
642
643
644
645
646
647
/* !END!: Do not edit above this line. */

#undef TCL_STORAGE_CLASS
#define TCL_STORAGE_CLASS DLLIMPORT
#undef TclpLocaltime_unix
#undef TclpGmtime_unix
#undef TclIntPlatReserved13



#if !defined(__WIN32__)
# undef TclpGetPid
# define TclpGetPid(pid) ((unsigned long) (pid))
#endif

#endif /* _TCLINTPLATDECLS */







>
>







634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
/* !END!: Do not edit above this line. */

#undef TCL_STORAGE_CLASS
#define TCL_STORAGE_CLASS DLLIMPORT
#undef TclpLocaltime_unix
#undef TclpGmtime_unix
#undef TclIntPlatReserved13
#undef TclWinConvertWSAError
#define TclWinConvertWSAError TclWinConvertError

#if !defined(__WIN32__)
# undef TclpGetPid
# define TclpGetPid(pid) ((unsigned long) (pid))
#endif

#endif /* _TCLINTPLATDECLS */