diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-09 16:13:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-09 16:13:58 (GMT) |
| commit | 5b605792cb9aa4524f0c4b740fd064b294ae667c (patch) | |
| tree | 12182b3fedf67b6f4566aaafe763332f92a9c70e /win | |
| parent | 5724764152674f9acd59a52633e5525567ba84b5 (diff) | |
| parent | 9ef7f0a940cdff5f1a7f0b8b77f82a10cae105f2 (diff) | |
| download | tcl-5b605792cb9aa4524f0c4b740fd064b294ae667c.zip tcl-5b605792cb9aa4524f0c4b740fd064b294ae667c.tar.gz tcl-5b605792cb9aa4524f0c4b740fd064b294ae667c.tar.bz2 | |
merge core-8-branch.
Remove stub entry for TclWinGetPlatformId(), as it is no longer needed. Is a macro now.
Diffstat (limited to 'win')
| -rw-r--r-- | win/tcl.rc | 20 | ||||
| -rw-r--r-- | win/tclWinDde.c | 7 |
2 files changed, 19 insertions, 8 deletions
@@ -4,6 +4,24 @@ #include <winver.h> #include <tcl.h> +// +// build-up the name suffix that defines the type of build this is. +// +#if TCL_THREADS +#define SUFFIX_THREADS "t" +#else +#define SUFFIX_THREADS "" +#endif + +#if DEBUG && !UNCHECKED +#define SUFFIX_DEBUG "g" +#else +#define SUFFIX_DEBUG "" +#endif + +#define SUFFIX SUFFIX_THREADS SUFFIX_DEBUG + + LANGUAGE 0x9, 0x1 /* LANG_ENGLISH, SUBLANG_DEFAULT */ VS_VERSION_INFO VERSIONINFO @@ -24,7 +42,7 @@ BEGIN BLOCK "040904b0" /* LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP */ BEGIN VALUE "FileDescription", "Tcl DLL\0" - VALUE "OriginalFilename", PRJLIBNAME + VALUE "OriginalFilename", "tcl" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".dll\0" VALUE "CompanyName", "ActiveState Corporation\0" VALUE "FileVersion", TCL_PATCH_LEVEL VALUE "LegalCopyright", "Copyright \251 2001 by ActiveState Corporation, et al\0" diff --git a/win/tclWinDde.c b/win/tclWinDde.c index 3255a9f..8b0be8d 100644 --- a/win/tclWinDde.c +++ b/win/tclWinDde.c @@ -152,13 +152,6 @@ Dde_Init( return TCL_ERROR; } -#ifdef UNICODE - if (TclWinGetPlatformId() < VER_PLATFORM_WIN32_NT) { - Tcl_SetObjResult(interp, Tcl_NewStringObj( - "Win32s and Windows 9x are not supported platforms", -1)); - return TCL_ERROR; - } -#endif Tcl_CreateObjCommand(interp, "dde", DdeObjCmd, NULL, NULL); Tcl_CreateExitHandler(DdeExitProc, NULL); return Tcl_PkgProvide(interp, TCL_DDE_PACKAGE_NAME, TCL_DDE_VERSION); |