diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-24 14:03:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-24 14:03:35 (GMT) |
| commit | 60091ce863fdbfbf444d6970d44fb50166ccd6fe (patch) | |
| tree | 01d9762601541ddc55b930c28b3d547c496b3d67 /generic/tkInt.h | |
| parent | e59d11829980b85d1a4c263d108f0a601fce5e5b (diff) | |
| parent | 5a024656faa09acb77aa34603e41b1cd5e38fbe5 (diff) | |
| download | tk-60091ce863fdbfbf444d6970d44fb50166ccd6fe.zip tk-60091ce863fdbfbf444d6970d44fb50166ccd6fe.tar.gz tk-60091ce863fdbfbf444d6970d44fb50166ccd6fe.tar.bz2 | |
Merge 8.6. Change macro names
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 530638a..3b1e559 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -84,6 +84,11 @@ # endif #endif +#if defined(__GNUC__) && (__GNUC__ > 2) +# define TKFLEXARRAY 0 +#else +# define TKFLEXARRAY 1 +#endif #ifndef Tcl_GetParent # define Tcl_GetParent Tcl_GetMaster @@ -358,14 +363,14 @@ typedef struct TkDisplay { */ Tcl_HashTable maintainHashTable; - /* Hash table that maps from a master's - * Tk_Window token to a list of slaves managed - * by that master. */ + /* Hash table that maps from a container's + * Tk_Window token to a list of windows managed + * by that container. */ int geomInit; #define TkGetGeomMaster(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \ ((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr) -#define TkGetGeomContainer TkGetGeomMaster +#define TkGetContainer TkGetGeomMaster /* * Information used by tkGet.c only: |