From 46aca37f2cc2f2dbbe85e71a26e7ca0aff7ba45f Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 22 Mar 2013 15:25:09 +0000 Subject: more merging --- generic/tk.h | 8 -------- generic/tkWindow.c | 6 ------ 2 files changed, 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 */ -- cgit v0.12