From 6d71bc534ef26440835770cb3b305fb91074f724 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 8 Sep 2011 08:20:32 +0000 Subject: Don't let tkDecls.h depend on on windows, not even in UNICODE mode --- ChangeLog | 5 +++++ generic/tkDecls.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0967ecf..b5ef851 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-09-08 Jan Nijtmans + + * generic/tkDecls.h: Don't let tkDecls.h depend on on + windows, not even in UNICODE mode. + 2011-09-01 Donal K. Fellows * doc/photo.n: Correctly documented what the [$ph data] command diff --git a/generic/tkDecls.h b/generic/tkDecls.h index b51a264..fb949b2 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.h @@ -1734,8 +1734,9 @@ extern const TkStubs *tkStubsPtr; #undef Tk_CreateConsoleWindow #if defined(_WIN32) && defined(UNICODE) -EXTERN void Tk_MainExW(int, TCHAR **, Tcl_AppInitProc *, Tcl_Interp *); # define Tk_MainEx Tk_MainExW + EXTERN void Tk_MainExW(int argc, wchar_t **argv, + Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); #endif #undef TCL_STORAGE_CLASS -- cgit v0.12