diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-05 14:43:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-05 14:43:26 (GMT) |
| commit | b24275a7c4fd64c8c556bc6f3176635e2f4c94af (patch) | |
| tree | 1222a9fcadb4dc639237525eae3a8157f86eb2b1 | |
| parent | ab6f3aa7a8502d10701e61e720efad362ccadd29 (diff) | |
| parent | 9f96f3816e86d6b0b51042e961d23652acdb059c (diff) | |
| download | tcl-b24275a7c4fd64c8c556bc6f3176635e2f4c94af.zip tcl-b24275a7c4fd64c8c556bc6f3176635e2f4c94af.tar.gz tcl-b24275a7c4fd64c8c556bc6f3176635e2f4c94af.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | unix/configure.ac | 3 | ||||
| -rw-r--r-- | unix/tclConfig.h.in | 13 |
2 files changed, 6 insertions, 10 deletions
diff --git a/unix/configure.ac b/unix/configure.ac index 546cd5c..d1a5da9 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -17,8 +17,9 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [ /* Undef unused package specific autoheader defines so that we can * include both tclConfig.h and tkConfig.h at the same time: */ /* override */ #undef PACKAGE_NAME - /* override */ #undef PACKAGE_STRING /* override */ #undef PACKAGE_TARNAME + /* override */ #undef PACKAGE_VERSION + /* override */ #undef PACKAGE_STRING #endif /* _TCLCONFIG */]) ]) diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in index 447a92b..853c6ac 100644 --- a/unix/tclConfig.h.in +++ b/unix/tclConfig.h.in @@ -139,7 +139,7 @@ /* Compiler support for module scope symbols */ #undef HAVE_HIDDEN -/* Do we have the intptr_t type? */ +/* Define to 1 if the system has the type `intptr_t'. */ #undef HAVE_INTPTR_T /* Define to 1 if you have the <inttypes.h> header file. */ @@ -289,7 +289,7 @@ /* Is off64_t in <sys/types.h>? */ #undef HAVE_TYPE_OFF64_T -/* Do we have the uintptr_t type? */ +/* Define to 1 if the system has the type `uintptr_t'. */ #undef HAVE_UINTPTR_T /* Define to 1 if you have the <unistd.h> header file. */ @@ -526,9 +526,6 @@ #undef inline #endif -/* Signed integer type wide enough to hold a pointer. */ -#undef intptr_t - /* Define to `int' if <sys/types.h> does not define. */ #undef mode_t @@ -544,13 +541,11 @@ /* Define to `int' if <sys/types.h> doesn't define. */ #undef uid_t -/* Unsigned integer type wide enough to hold a pointer. */ -#undef uintptr_t - /* Undef unused package specific autoheader defines so that we can * include both tclConfig.h and tkConfig.h at the same time: */ /* override */ #undef PACKAGE_NAME - /* override */ #undef PACKAGE_STRING /* override */ #undef PACKAGE_TARNAME + /* override */ #undef PACKAGE_VERSION + /* override */ #undef PACKAGE_STRING #endif /* _TCLCONFIG */ |