Skip to content

Commit 743f98d

Browse files
author
jan.nijtmans
committed
Merge 8.6
2 parents d5b9e9b + 399c731 commit 743f98d

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

generic/tk.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@ typedef Tcl_Size (Tk_SelectionProc) (void *clientData, Tcl_Size offset,
15551555
*----------------------------------------------------------------------
15561556
*/
15571557

1558-
#include "tkDecls.h"
1558+
#include "tkDecls.h" /* IWYU pragma: export */
15591559

15601560
#undef TCL_STORAGE_CLASS
15611561
#define TCL_STORAGE_CLASS DLLIMPORT

generic/tkInt.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
#endif
3434
#include <stdint.h>
3535
#include <stdlib.h>
36+
#if defined(_MSC_VER) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ < 202311L))
3637
#include <stdbool.h>
38+
#endif
3739
#ifdef BYTE_ORDER
3840
# ifdef BIG_ENDIAN
3941
# if BYTE_ORDER == BIG_ENDIAN

0 commit comments

Comments
 (0)