diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-06-03 11:13:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-06-03 11:13:28 (GMT) |
| commit | 61b9ed1c00f2d74eb9e160868ca1a0fca43bd6a2 (patch) | |
| tree | 82ff40c327747faab68b12f160c5b271ec0c840a | |
| parent | 5ad56f498e969ec873ccc117e34cebf114e13f59 (diff) | |
| parent | 7e5b4c8530c66c478348ac66e9c508c8e5d6b9d3 (diff) | |
| download | tk-61b9ed1c00f2d74eb9e160868ca1a0fca43bd6a2.zip tk-61b9ed1c00f2d74eb9e160868ca1a0fca43bd6a2.tar.gz tk-61b9ed1c00f2d74eb9e160868ca1a0fca43bd6a2.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | macosx/tkMacOSXImage.c | 4 | ||||
| -rw-r--r-- | win/tkWinCursor.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c index 934ada6..6b0a8c6 100644 --- a/macosx/tkMacOSXImage.c +++ b/macosx/tkMacOSXImage.c @@ -645,8 +645,8 @@ CreateCGImageFromPixmap( *---------------------------------------------------------------------- */ struct pixel_fmt {int r; int g; int b; int a;}; -static struct pixel_fmt bgra = {2, 1, 0, 3}; -static struct pixel_fmt abgr = {3, 2, 1, 0}; +static const struct pixel_fmt bgra = {2, 1, 0, 3}; +static const struct pixel_fmt abgr = {3, 2, 1, 0}; XImage * XGetImage( diff --git a/win/tkWinCursor.c b/win/tkWinCursor.c index 0a984f9..4e9a546 100644 --- a/win/tkWinCursor.c +++ b/win/tkWinCursor.c @@ -39,7 +39,7 @@ typedef struct { * resource identifier. */ -static struct CursorName { +static const struct CursorName { const char *name; LPCTSTR id; } cursorNames[] = { @@ -96,7 +96,7 @@ TkGetCursorByName( Tk_Uid string) /* Description of cursor. See manual entry for * details on legal syntax. */ { - struct CursorName *namePtr; + const struct CursorName *namePtr; TkWinCursor *cursorPtr; int argc; const char **argv = NULL; |