diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-09-08 08:20:32 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-09-08 08:20:32 (GMT) |
commit | 6d71bc534ef26440835770cb3b305fb91074f724 (patch) | |
tree | c8626fb061d2fac6d7ad1dd86c8781bcf7bc4d9d | |
parent | b0619711e2e6b9f64ae786766477215f9878bf5c (diff) | |
download | tk-6d71bc534ef26440835770cb3b305fb91074f724.zip tk-6d71bc534ef26440835770cb3b305fb91074f724.tar.gz tk-6d71bc534ef26440835770cb3b305fb91074f724.tar.bz2 |
Don't let tkDecls.h depend on <tchar.h> on windows, not even in UNICODE mode
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | generic/tkDecls.h | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2011-09-08 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tkDecls.h: Don't let tkDecls.h depend on <tchar.h> on + windows, not even in UNICODE mode. + 2011-09-01 Donal K. Fellows <dkf@users.sf.net> * 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 |