diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-03-06 15:29:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-03-06 15:29:54 (GMT) |
| commit | 7293da8bb72712757786b863b3e5ecd826917916 (patch) | |
| tree | 0acc593d65c0ed250414e43684b95b74b1d4b44a /generic | |
| parent | 7f94543bc8a39f0f426203faef8b5b5a9fa4fb56 (diff) | |
| download | tk-7293da8bb72712757786b863b3e5ecd826917916.zip tk-7293da8bb72712757786b863b3e5ecd826917916.tar.gz tk-7293da8bb72712757786b863b3e5ecd826917916.tar.bz2 | |
More -Wconversion C warning fixes
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkInt.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 09afe37..b1d3964 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -88,22 +88,8 @@ # define TKFLEXARRAY 1 #endif -#if (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7) -# define TCL_ENCODING_STRICT 0x44 -#endif - - -#if TCL_MAJOR_VERSION < 9 -# undef Tcl_ExternalToUtfDStringEx -# undef Tcl_UtfToExternalDStringEx - /* just assume 'flags' is TCL_ENCODING_NOCOMPLAIN, and return value not used. */ -# define Tcl_ExternalToUtfDStringEx(encoding, data, length, flags, ds) \ - (Tcl_ExternalToUtfDString(encoding, data, length, ds), TCL_INDEX_NONE) -# define Tcl_UtfToExternalDStringEx(encoding, data, length, flags, ds) \ - (Tcl_UtfToExternalDString(encoding, data, length, ds), TCL_INDEX_NONE) -# if !defined(Tcl_GetParent) && (TCL_MINOR_VERSION < 7) -# define Tcl_GetParent Tcl_GetMaster -# endif +#if !defined(Tcl_GetParent) && (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7) +# define Tcl_GetParent Tcl_GetMaster #endif /* @@ -272,7 +258,7 @@ typedef struct TkDisplay { TkLockUsage lockUsage; /* Indicates how to interpret lock * modifier. */ - int numModKeyCodes; /* Number of entries in modKeyCodes array + Tcl_Size numModKeyCodes; /* Number of entries in modKeyCodes array * below. */ KeyCode *modKeyCodes; /* Pointer to an array giving keycodes for all * of the keys that have modifiers associated |