diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-18 21:57:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-18 21:57:57 (GMT) |
| commit | 0f0d73f7b38dd1033c810a56f9840636ce678617 (patch) | |
| tree | 4019fb20f8e85606550e865c345fea5610aad0d9 /generic/tk.h | |
| parent | 0ac0d239102133abed26f5d57d690f0aaa6bd199 (diff) | |
| parent | 4dd4557d1b695615fc7b2122831f95b116c887d2 (diff) | |
| download | tk-0f0d73f7b38dd1033c810a56f9840636ce678617.zip tk-0f0d73f7b38dd1033c810a56f9840636ce678617.tar.gz tk-0f0d73f7b38dd1033c810a56f9840636ce678617.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tk.h')
| -rw-r--r-- | generic/tk.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/generic/tk.h b/generic/tk.h index 5af8d6a..6cd0943 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -272,13 +272,9 @@ typedef struct Tk_ObjCustomOption { * Computes number of bytes from beginning of structure to a given field. */ -#ifndef TK_NO_DEPRECATED +#if !defined(TK_NO_DEPRECATED) && (TK_MAJOR_VERSION < 9) && !defined(BUILD_tk) # define Tk_Offset(type, field) ((int) offsetof(type, field)) #endif -/* Workaround for platforms missing offsetof(), e.g. VC++ 6.0 */ -#ifndef offsetof -# define offsetof(type, field) ((size_t) ((char *) &((type *) 0)->field)) -#endif /* * The following two structures are used for error handling. When config |