diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-10-12 15:23:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-10-12 15:23:34 (GMT) |
| commit | 1152be81e65a9a99a71c5e386ee59aee7d0c670c (patch) | |
| tree | 4d6a5aa23278198b58077d424f72fa0a8772eec4 | |
| parent | aa484cae05c7a7bc67b620173ab952c397fefe82 (diff) | |
| parent | b11f15674dffb16c8d5dad32784d0a4830be78a4 (diff) | |
| download | tcl-1152be81e65a9a99a71c5e386ee59aee7d0c670c.zip tcl-1152be81e65a9a99a71c5e386ee59aee7d0c670c.tar.gz tcl-1152be81e65a9a99a71c5e386ee59aee7d0c670c.tar.bz2 | |
merge novem
| -rw-r--r-- | .fossil-settings/ignore-glob | 3 | ||||
| -rw-r--r-- | generic/tclDecls.h | 8 | ||||
| -rw-r--r-- | win/tclWinLoad.c | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob index d5c9a1e..c85b488 100644 --- a/.fossil-settings/ignore-glob +++ b/.fossil-settings/ignore-glob @@ -44,4 +44,5 @@ unix/pkgs/* win/Debug* win/Release* win/pkgs/* -win/tcl.hpjwin/nmhlp-out.txt +win/tcl.hpj +win/nmhlp-out.txt diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 00e2a89..563a478 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -20,14 +20,6 @@ # define TCL_DEPRECATED(msg) EXTERN #endif -#if !defined(BUILD_tcl) -# define TCL_DEPRECATED(msg) EXTERN TCL_DEPRECATED_API(msg) -#elif defined(TCL_NO_DEPRECATED) -# define TCL_DEPRECATED(msg) MODULE_SCOPE -#else -# define TCL_DEPRECATED(msg) EXTERN -#endif - /* * WARNING: This file is automatically generated by the tools/genStubs.tcl * script. Any modifications to the function declarations below should be made diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c index 3ad6328..27eb8f3 100644 --- a/win/tclWinLoad.c +++ b/win/tclWinLoad.c @@ -85,7 +85,7 @@ TclpDlopen( Tcl_DString ds; - /* + /* * Remember the first error on load attempt to be used if the * second load attempt below also fails. */ |