diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-07-18 11:56:23 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-07-18 11:56:23 (GMT) |
commit | 004fe2d35203d7d11d592e8808c83f8a04dfeb31 (patch) | |
tree | 205b18d8409c76f046212d0bc0457ec465dead68 /win/tclAppInit.c | |
parent | b0dd51b115eda106d6dd034f4867d446d28f4e1c (diff) | |
download | tcl-004fe2d35203d7d11d592e8808c83f8a04dfeb31.zip tcl-004fe2d35203d7d11d592e8808c83f8a04dfeb31.tar.gz tcl-004fe2d35203d7d11d592e8808c83f8a04dfeb31.tar.bz2 |
Updste stdlib.h (add missing functions). Restructure tclAppInit.c
Diffstat (limited to 'win/tclAppInit.c')
-rw-r--r-- | win/tclAppInit.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/win/tclAppInit.c b/win/tclAppInit.c index 4dd6c6e..53ac274 100644 --- a/win/tclAppInit.c +++ b/win/tclAppInit.c @@ -14,21 +14,15 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#if defined(BUILD_tcl) || defined(USE_TCL_STUBS) -#error "Don't build with BUILD_tcl/USE_TCL_STUBS!" -#endif #include "tcl.h" -#define WIN32_LEAN_AND_MEAN -#define STRICT /* See MSDN Article Q83456 */ -#include <windows.h> -#undef STRICT -#undef WIN32_LEAN_AND_MEAN -#include <locale.h> -#include <stdlib.h> -#include <tchar.h> -#if TCL_MAJOR_VERSION < 9 && TCL_MINOR_VERSION < 7 +#if TCL_MAJOR_VERSION < 9 +# if defined(BUILD_tcl) || defined(USE_TCL_STUBS) +# error "Don't build with BUILD_tcl/USE_TCL_STUBS!" +# endif +# if TCL_MINOR_VERSION < 7 # define Tcl_LibraryInitProc Tcl_PackageInitProc # define Tcl_StaticLibrary Tcl_StaticPackage +# endif #endif #ifdef TCL_TEST @@ -42,6 +36,14 @@ extern Tcl_LibraryInitProc Dde_Init; extern Tcl_LibraryInitProc Dde_SafeInit; #endif +#define WIN32_LEAN_AND_MEAN +#define STRICT /* See MSDN Article Q83456 */ +#include <windows.h> +#undef STRICT +#undef WIN32_LEAN_AND_MEAN +#include <locale.h> +#include <stdlib.h> +#include <tchar.h> #if defined(__GNUC__) || defined(TCL_BROKEN_MAINARGS) int _CRT_glob = 0; #endif /* __GNUC__ || TCL_BROKEN_MAINARGS */ |