diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-21 07:45:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-21 07:45:48 (GMT) |
| commit | 214d0955f9b9f462dce0ba576979f679d94e345f (patch) | |
| tree | 7fdd19ed41b54f645700eb2d629c21215abea3e4 | |
| parent | fee98d6fc05284034d11e98d448f1b4cbeaaecc3 (diff) | |
| download | tk-214d0955f9b9f462dce0ba576979f679d94e345f.zip tk-214d0955f9b9f462dce0ba576979f679d94e345f.tar.gz tk-214d0955f9b9f462dce0ba576979f679d94e345f.tar.bz2 | |
In X11-R6 _XLIB_H changed to _X11_XLIB_H_, so adapt for that.
Also include <stddef.h> in more compilers we know of (same as in tclInt.h).
| -rw-r--r-- | generic/tk.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tk.h b/generic/tk.h index 2a3d602..3d5f3b7 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -76,13 +76,14 @@ extern "C" { #ifndef RC_INVOKED -#ifndef _XLIB_H +#if !defined(_XLIB_H) && !defined(_X11_XLIB_H_) # include <X11/Xlib.h> # ifdef MAC_OSX_TK # include <X11/X.h> # endif #endif -#ifdef __STDC__ +#if defined(STDC_HEADERS) || defined(__STDC__) || defined(__C99__FUNC__) \ + || defined(__cplusplus) || defined(_MSC_VER) || defined(__ICC) # include <stddef.h> #endif |