From 9ba6d7b21fed9e61a8e0bf74932aea176849a7f7 Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 31 Jan 2002 04:42:00 +0000 Subject: * The POTENTIAL INCOMPATIBILITY in the changing interface of Tk_ParseArgv can now be removed by the -DUSE_NON_CONST compiler flag. --- ChangeLog | 7 +++++++ generic/tk.decls | 4 ++-- generic/tkDecls.h | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f5f5d9..13c3646 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-01-30 Don Porter + + * generic/tk.decls: The POTENTIAL INCOMPATIBILITY in the changing + interface of Tk_ParseArgv can now be removed by the -DUSE_NON_CONST + compiler flag. + * generic/tkDecls.h: make genstubs + 2002-01-29 Andreas Kupries * win/tkWinInit.c (TkpGetAppName): TIP 27 fixup. The code now does diff --git a/generic/tk.decls b/generic/tk.decls index 1b7132d..e607105 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tk.decls,v 1.16 2002/01/25 21:09:36 dgp Exp $ +# RCS: @(#) $Id: tk.decls,v 1.17 2002/01/31 04:42:00 dgp Exp $ library tk @@ -703,7 +703,7 @@ declare 142 generic { declare 143 generic { int Tk_ParseArgv (Tcl_Interp *interp, \ - Tk_Window tkwin, int *argcPtr, CONST char **argv, \ + Tk_Window tkwin, int *argcPtr, CONST84 char **argv, \ Tk_ArgvInfo *argTable, int flags) } diff --git a/generic/tkDecls.h b/generic/tkDecls.h index 73f97a2..d787cf6 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkDecls.h,v 1.16 2002/01/25 21:09:36 dgp Exp $ + * RCS: @(#) $Id: tkDecls.h,v 1.17 2002/01/31 04:42:00 dgp Exp $ */ #ifndef _TKDECLS @@ -507,7 +507,7 @@ EXTERN void Tk_OwnSelection _ANSI_ARGS_((Tk_Window tkwin, /* 143 */ EXTERN int Tk_ParseArgv _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, int * argcPtr, - CONST char ** argv, Tk_ArgvInfo * argTable, + CONST84 char ** argv, Tk_ArgvInfo * argTable, int flags)); /* 144 */ EXTERN void Tk_PhotoPutBlock _ANSI_ARGS_((Tk_PhotoHandle handle, @@ -998,7 +998,7 @@ typedef struct TkStubs { char * (*tk_NameOfRelief) _ANSI_ARGS_((int relief)); /* 140 */ Tk_Window (*tk_NameToWindow) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * pathName, Tk_Window tkwin)); /* 141 */ void (*tk_OwnSelection) _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Tk_LostSelProc * proc, ClientData clientData)); /* 142 */ - int (*tk_ParseArgv) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, int * argcPtr, CONST char ** argv, Tk_ArgvInfo * argTable, int flags)); /* 143 */ + int (*tk_ParseArgv) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, int * argcPtr, CONST84 char ** argv, Tk_ArgvInfo * argTable, int flags)); /* 143 */ void (*tk_PhotoPutBlock) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height)); /* 144 */ void (*tk_PhotoPutZoomedBlock) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY)); /* 145 */ int (*tk_PhotoGetImage) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr)); /* 146 */ -- cgit v0.12