diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-10 06:59:22 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-10 06:59:22 (GMT) |
| commit | ce0f0f80b78d67262dfc3270f6b26a042f19141d (patch) | |
| tree | 40d06784df77bfbae1c7e7bd89f9015e9d14551e /generic/tkTextDisp.c | |
| parent | abc19613ce37f3616bce34410b1b00b69c8a0de3 (diff) | |
| parent | 00b8a9b7dca2e057f57acf088bb0792edc77769a (diff) | |
| download | tk-ce0f0f80b78d67262dfc3270f6b26a042f19141d.zip tk-ce0f0f80b78d67262dfc3270f6b26a042f19141d.tar.gz tk-ce0f0f80b78d67262dfc3270f6b26a042f19141d.tar.bz2 | |
Merge trunk. Introduce TKFLEXARRAY, since this usage is a GNU extension (lated adopted by MSVC too)
Diffstat (limited to 'generic/tkTextDisp.c')
| -rw-r--r-- | generic/tkTextDisp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index abcd3e3..d56a675 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -444,8 +444,8 @@ typedef struct TextDInfo { typedef struct CharInfo { int numBytes; /* Number of bytes to display. */ - char chars[1]; /* UTF characters to display. Actual size will - * be numBytes, not 1. THIS MUST BE THE LAST + char chars[TKFLEXARRAY]; /* UTF characters to display. + * Allocated as large as necessary. THIS MUST BE THE LAST * FIELD IN THE STRUCTURE. */ } CharInfo; |