diff options
| author | dgp <dgp@users.sourceforge.net> | 2019-08-26 19:16:47 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2019-08-26 19:16:47 (GMT) |
| commit | cbbc73634d6c136a0f4b83d7bc2b77e0fda1ecf2 (patch) | |
| tree | f2301779d0a69ece7b043c85b6005987422bb8ff /generic/tk.h | |
| parent | 5709fc8e15db49b5f31b00439ee8372c8bbfdfb1 (diff) | |
| parent | 4e1fa430f445a52292a5bd1ee9fab8ba51d2c009 (diff) | |
| download | tk-cbbc73634d6c136a0f4b83d7bc2b77e0fda1ecf2.zip tk-cbbc73634d6c136a0f4b83d7bc2b77e0fda1ecf2.tar.gz tk-cbbc73634d6c136a0f4b83d7bc2b77e0fda1ecf2.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tk.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 18d10c1..ef9a825 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -85,13 +85,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 |