diff options
| author | nijtmans <nijtmans> | 2008-10-30 21:39:16 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2008-10-30 21:39:16 (GMT) |
| commit | bc7cc1de3c6e12a43abe48282f8eeb413b3bb22a (patch) | |
| tree | 9b240e7e0a446a742160201af095d711ba73aa70 /generic/tkDecls.h | |
| parent | c1f0473e3354fd5c7471d0389e6bcd9a200ec8c7 (diff) | |
| download | tk-bc7cc1de3c6e12a43abe48282f8eeb413b3bb22a.zip tk-bc7cc1de3c6e12a43abe48282f8eeb413b3bb22a.tar.gz tk-bc7cc1de3c6e12a43abe48282f8eeb413b3bb22a.tar.bz2 | |
[Bug 2190619] Warnings due to Tk_SmoothMethod
name constness change.
Although dkf's solution (simply adding a type cast)
is correct as well, changing the return value (as das
suggested) has the advantage that
all Tk_OptionPrintProc implementations don't
need a type cast any more in its code. This
makes all those functions robust against
the -Wwrite-strings warning option.
Further on, the customPtr field of Tk_ConfigSpec
can be a constant, without any danger of
source incompatibility.
Diffstat (limited to 'generic/tkDecls.h')
| -rw-r--r-- | generic/tkDecls.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkDecls.h b/generic/tkDecls.h index a888168..b51a4a6 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.36 2008/10/28 22:33:06 nijtmans Exp $ + * RCS: @(#) $Id: tkDecls.h,v 1.37 2008/10/30 21:39:16 nijtmans Exp $ */ #ifndef _TKDECLS @@ -154,7 +154,7 @@ EXTERN int Tk_CanvasTagsParseProc (ClientData clientData, #ifndef Tk_CanvasTagsPrintProc_TCL_DECLARED #define Tk_CanvasTagsPrintProc_TCL_DECLARED /* 19 */ -EXTERN char * Tk_CanvasTagsPrintProc (ClientData clientData, +EXTERN CONST86 char * Tk_CanvasTagsPrintProc (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); #endif @@ -1725,7 +1725,7 @@ typedef struct TkStubs { double (*tk_CanvasPsY) (Tk_Canvas canvas, double y); /* 16 */ void (*tk_CanvasSetStippleOrigin) (Tk_Canvas canvas, GC gc); /* 17 */ int (*tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, const char * value, char * widgRec, int offset); /* 18 */ - char * (*tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 19 */ + CONST86 char * (*tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 19 */ Tk_Window (*tk_CanvasTkwin) (Tk_Canvas canvas); /* 20 */ void (*tk_CanvasWindowCoords) (Tk_Canvas canvas, double x, double y, short * screenXPtr, short * screenYPtr); /* 21 */ void (*tk_ChangeWindowAttributes) (Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes * attsPtr); /* 22 */ |