diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-03-22 15:25:09 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-03-22 15:25:09 (GMT) |
| commit | d0afb8f5e05c54d6cbe2ca113a20a63cb0d0aa61 (patch) | |
| tree | 870d272cd5a767c020fb5c455151540af2eba7e2 /generic | |
| parent | c67b833b17381c36951c3072aaa9458460c2b689 (diff) | |
| download | tk-d0afb8f5e05c54d6cbe2ca113a20a63cb0d0aa61.zip tk-d0afb8f5e05c54d6cbe2ca113a20a63cb0d0aa61.tar.gz tk-d0afb8f5e05c54d6cbe2ca113a20a63cb0d0aa61.tar.bz2 | |
more merging
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tk.h | 8 | ||||
| -rw-r--r-- | generic/tkWindow.c | 6 |
2 files changed, 0 insertions, 14 deletions
diff --git a/generic/tk.h b/generic/tk.h index 0614866..7c686a3 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -22,14 +22,6 @@ #endif #ifndef _ANSI_ARGS_ -# ifndef NO_PROTOTYPES -# define _ANSI_ARGS_(x) x -# else -# define _ANSI_ARGS_(x) () -# endif -#endif - -#ifndef _ANSI_ARGS_ # ifndef NO_PROTOTYPES # define _ANSI_ARGS_(x) x # else diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 929136d..2901256 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3275,12 +3275,6 @@ Initialize( Tcl_SetMainLoop(Tk_MainLoop); -/* -#undef Tk_InitStubs - - Tk_InitStubs(interp, TK_VERSION, 1); -*/ - /* * Initialized the themed widget set */ |