<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ff58b268bf7c0a98de3f25ef0901427561ca8634">https://github.com/macports/macports-ports/commit/ff58b268bf7c0a98de3f25ef0901427561ca8634</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ff58b268bf7 tktable: fix remaining compiler warnings
</span>ff58b268bf7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ff58b268bf7c0a98de3f25ef0901427561ca8634
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri Nov 13 20:59:34 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> tktable: fix remaining compiler warnings
</span>---
x11/tktable/Portfile | 4 +
x11/tktable/files/patch-CONST86.diff | 147 +++++++
x11/tktable/files/patch-INT2PTR.diff | 814 +++++++++++++++++++++++++++++++++++
x11/tktable/files/patch-quartz.diff | 10 +-
4 files changed, 970 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tktable/Portfile b/x11/tktable/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 076d06067fd..7737d16ad3c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tktable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tktable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,10 @@ checksums rmd160 2332e79467b15c5b9855dd12ad6f21328017fa2b \
</span> sha256 7c9c06338c2cb7e414f23650e4122093b540c60c672dc4f440a12588e1b3a1d5 \
size 292797
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix remaining compiler warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-CONST86.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-INT2PTR.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # ensure correct libraries are found during testing
# see https://trac.macports.org/ticket/38238
patchfiles-append patch-dyld_variable.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tktable/files/patch-CONST86.diff b/x11/tktable/files/patch-CONST86.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b34639b6f0b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tktable/files/patch-CONST86.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,147 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix compiler warning:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+incompatible pointer types initializing 'Tk_OptionPrintProc *' (aka 'const char *(*)(void *, struct Tk_Window_ *, char *, int, void (**)(char *))') with an expression of type 'char *(ClientData, Tk_Window, char *, int, Tcl_FreeProc **)' (aka 'char *(void *, struct Tk_Window_ *, char *, int, void (**)(char *))') [-Wincompatible-pointer-types]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Pending (Tktable is dormant)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: generic/tkTable.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- generic/tkTable.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ generic/tkTable.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,16 +32,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define HAVE_TCL84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Tcl/Tk 8.4 introduced better CONST-ness in the APIs, but we use CONST84 in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Tcl/Tk 8.4 and 8.6 introduced better CONST-ness in the APIs, but we use CONST84/CONST86 in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * some cases for compatibility with earlier Tcl headers to prevent warnings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef CONST84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define CONST84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef CONST86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define CONST86 CONST84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* This EXTERN declaration is needed for Tcl < 8.0.3 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef EXTERN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define EXTERN extern "C"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -517,20 +520,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void Table_ClearHashTable(Tcl_HashTable *hashTblPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int TableOptionBdSet(ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp, Tk_Window tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONST84 char *value, char *widgRec, int offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char * TableOptionBdGet(ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern CONST86 char * TableOptionBdGet(ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin, char *widgRec, int offset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_FreeProc **freeProcPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int TableTagConfigureBd(Table *tablePtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableTag *tagPtr, char *oldValue, int nullOK);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int Cmd_OptionSet(ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window unused, CONST84 char *value,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *widgRec, int offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern char * Cmd_OptionGet(ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern CONST86 char * Cmd_OptionGet(ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window unused, char *widgRec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset, Tcl_FreeProc **freeProcPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * HEADERS IN tkTableCell.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: generic/tkTableTag.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- generic/tkTableTag.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ generic/tkTableTag.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,11 +20,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void TableImageProc _ANSI_ARGS_((ClientData clientData, int x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int y, int width, int height, int imageWidth, int imageHeight));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int TableOptionReliefSet _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp, Tk_Window tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONST84 char *value, char *widgRec, int offset));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static char * TableOptionReliefGet _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static CONST86 char * TableOptionReliefGet _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin, char *widgRec, int offset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_FreeProc **freeProcPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static CONST84 char *tagCmdNames[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "celltag", "cget", "coltag", "configure", "delete", "exists",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1338,11 +1338,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * None.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static CONST86 char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableOptionReliefGet(clientData, tkwin, widgRec, offset, freeProcPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Type of struct being set. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin; /* Window containing canvas widget. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *widgRec; /* Pointer to record for item. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset; /* Offset into item. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: generic/tkTableUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- generic/tkTableUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ generic/tkTableUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,11 +167,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * None.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CONST86 char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableOptionBdGet(clientData, tkwin, widgRec, offset, freeProcPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Type of struct being set. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin; /* Window containing canvas widget. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *widgRec; /* Pointer to record for item. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset; /* Offset into item. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,11 +327,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * None.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CONST86 char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Cmd_OptionGet(ClientData clientData, Tk_Window unused,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Cmd_Struct *p = (Cmd_Struct *)clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int mode = *((int*)(widgRec+offset));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: generic/tkTableWin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- generic/tkTableWin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ generic/tkTableWin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,11 +15,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tkTable.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int StickyParseProc _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp, Tk_Window tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONST84 char *value, char *widgRec, int offset));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static char * StickyPrintProc _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static CONST86 char * StickyPrintProc _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin, char *widgRec, int offset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_FreeProc **freeProcPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void EmbWinLostSlaveProc _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,11 +115,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Side effects:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * none.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static CONST86 char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StickyPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Ignored. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin; /* Window for text widget. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *widgRec; /* Pointer to TkTextEmbWindow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * structure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tktable/files/patch-INT2PTR.diff b/x11/tktable/files/patch-INT2PTR.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..eca5f2bb16b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tktable/files/patch-INT2PTR.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,814 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use INT2PTR(), PTR2INT(), and PTR2UINT() macros to avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+int-to-pointer/pointer-to-int compiler warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Based on approach used by Tcl/Tk and other extensions (e.g. tdbc::postgres)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Note that configure.in is patched prior to configure to avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+running autoconf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Pending (Tktable is dormant)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,10 +144,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set the default compiler switches based on the --enable-symbols
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEA_ENABLE_SYMBOLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Integer pointer types used by the (U)INT2PTR / PTR2(U)INT macros.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_TYPE_INTPTR_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_TYPE_UINTPTR_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Everyone should be linking against the Tcl stub library. If you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # can't for some reason, remove this definition. If you aren't using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # stubs, you also need to modify the SHLIB_LD_LIBS setting below to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11399,10 +11399,330 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:$LINENO: result: enabled $tcl_ok debugging" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "enabled $tcl_ok debugging" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Integer pointer types used by the (U)INT2PTR / PTR2(U)INT macros.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:$LINENO: checking for intptr_t" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo_n "checking for intptr_t... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "${ac_cv_type_intptr_t+set}" = set; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_type_intptr_t=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$ac_includes_default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (sizeof (intptr_t))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f conftest.$ac_objext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if { (ac_try="$ac_compile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++case "(($ac_try" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *) ac_try_echo=$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "$ac_try_echo") >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (eval "$ac_compile") 2>conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ grep -v '^ *+' conftest.er1 >conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat conftest.err >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (exit $ac_status); } && {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test -z "$ac_c_werror_flag" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test ! -s conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } && test -s conftest.$ac_objext; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$ac_includes_default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (sizeof ((intptr_t)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f conftest.$ac_objext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if { (ac_try="$ac_compile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++case "(($ac_try" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *) ac_try_echo=$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "$ac_try_echo") >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (eval "$ac_compile") 2>conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ grep -v '^ *+' conftest.er1 >conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat conftest.err >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (exit $ac_status); } && {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test -z "$ac_c_werror_flag" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test ! -s conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } && test -s conftest.$ac_objext; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_type_intptr_t=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "$ac_cv_type_intptr_t" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "x$ac_cv_type_intptr_t" = x""yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>confdefs.h <<\_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_INTPTR_T 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for ac_type in 'int' 'long int' 'long long int'; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$ac_includes_default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++test_array [0] = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f conftest.$ac_objext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if { (ac_try="$ac_compile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++case "(($ac_try" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *) ac_try_echo=$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "$ac_try_echo") >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (eval "$ac_compile") 2>conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ grep -v '^ *+' conftest.er1 >conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat conftest.err >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (exit $ac_status); } && {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test -z "$ac_c_werror_flag" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test ! -s conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } && test -s conftest.$ac_objext; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define intptr_t $ac_type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_type=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test -z "$ac_type" && break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:$LINENO: checking for uintptr_t" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo_n "checking for uintptr_t... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "${ac_cv_type_uintptr_t+set}" = set; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_type_uintptr_t=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$ac_includes_default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (sizeof (uintptr_t))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f conftest.$ac_objext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if { (ac_try="$ac_compile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++case "(($ac_try" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *) ac_try_echo=$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "$ac_try_echo") >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (eval "$ac_compile") 2>conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ grep -v '^ *+' conftest.er1 >conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat conftest.err >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (exit $ac_status); } && {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test -z "$ac_c_werror_flag" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test ! -s conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } && test -s conftest.$ac_objext; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$ac_includes_default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (sizeof ((uintptr_t)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f conftest.$ac_objext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if { (ac_try="$ac_compile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++case "(($ac_try" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *) ac_try_echo=$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "$ac_try_echo") >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (eval "$ac_compile") 2>conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ grep -v '^ *+' conftest.er1 >conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat conftest.err >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (exit $ac_status); } && {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test -z "$ac_c_werror_flag" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test ! -s conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } && test -s conftest.$ac_objext; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_type_uintptr_t=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "$ac_cv_type_uintptr_t" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "x$ac_cv_type_uintptr_t" = x""yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>confdefs.h <<\_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_UINTPTR_T 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for ac_type in 'unsigned int' 'unsigned long int' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'unsigned long long int'; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$ac_includes_default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++test_array [0] = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f conftest.$ac_objext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if { (ac_try="$ac_compile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++case "(($ac_try" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *) ac_try_echo=$ac_try;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "$ac_try_echo") >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (eval "$ac_compile") 2>conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ grep -v '^ *+' conftest.er1 >conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f conftest.er1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat conftest.err >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (exit $ac_status); } && {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test -z "$ac_c_werror_flag" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test ! -s conftest.err
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } && test -s conftest.$ac_objext; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define uintptr_t $ac_type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_type=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $as_echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test -z "$ac_type" && break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Everyone should be linking against the Tcl stub library. If you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # can't for some reason, remove this definition. If you aren't using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: generic/tkTable.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- generic/tkTable.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ generic/tkTable.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1966,11 +1966,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Merge colPtr if it exists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * let's see if we have the value cached already
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * if not, run the findColTag routine and cache the value
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entryPtr = Tcl_CreateHashEntry(colTagsCache, (char *)ucol, &new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entryPtr = Tcl_CreateHashEntry(colTagsCache, INT2PTR(ucol), &new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (new) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colPtr = FindRowColTag(tablePtr, ucol, COL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetHashValue(entryPtr, colPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colPtr = (TableTag *) Tcl_GetHashValue(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2657,11 +2657,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int entries, count, row, col;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entries = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (entryPtr = Tcl_FirstHashEntry(tablePtr->flashCells, &search);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr != NULL; entryPtr = Tcl_NextHashEntry(&search)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- count = (int) Tcl_GetHashValue(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ count = PTR2INT(Tcl_GetHashValue(entryPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (--count <= 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* get the cell address and invalidate that region only */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableParseArrayIndex(&row, &col,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_GetHashKey(tablePtr->flashCells, entryPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2669,11 +2669,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteHashEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableRefresh(tablePtr, row-tablePtr->rowOffset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ col-tablePtr->colOffset, CELL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_SetHashValue(entryPtr, (ClientData) count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetHashValue(entryPtr, INT2PTR(count));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entries++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* do I need to restart the timer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2714,11 +2714,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* create the array index in user coords */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableMakeArrayIndex(row+tablePtr->rowOffset, col+tablePtr->colOffset, buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* add the flash to the hash table */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr = Tcl_CreateHashEntry(tablePtr->flashCells, buf, &dummy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_SetHashValue(entryPtr, tablePtr->flashTime);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetHashValue(entryPtr, INT2PTR(tablePtr->flashTime));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* now set the timer if it's not already going and invalidate the area */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tablePtr->flashTimer == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tablePtr->flashTimer = Tcl_CreateTimerHandler(250, TableFlashEvent,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (ClientData) tablePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3113,17 +3113,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastUnpreset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ numPixels = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unpreset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < tablePtr->cols; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entryPtr = Tcl_FindHashEntry(tablePtr->colWidths, (char *) i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entryPtr = Tcl_FindHashEntry(tablePtr->colWidths, INT2PTR(i));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tablePtr->colPixels[i] = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unpreset++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastUnpreset = i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- value = (int) Tcl_GetHashValue(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ value = PTR2INT(Tcl_GetHashValue(entryPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (value > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tablePtr->colPixels[i] = value * tablePtr->charWidth + px;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * When a value in pixels is specified, we take that exact
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3207,17 +3207,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* get all the preset rows and set their heights */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastUnpreset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ numPixels = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unpreset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < tablePtr->rows; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entryPtr = Tcl_FindHashEntry(tablePtr->rowHeights, (char *) i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entryPtr = Tcl_FindHashEntry(tablePtr->rowHeights, INT2PTR(i));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tablePtr->rowPixels[i] = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unpreset++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastUnpreset = i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- value = (int) Tcl_GetHashValue(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ value = PTR2INT(Tcl_GetHashValue(entryPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (value > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tablePtr->rowPixels[i] = value * tablePtr->charHeight + py;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * When a value in pixels is specified, we take that exact
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3790,11 +3790,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableRestrictProc(serial, eventPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData serial;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XEvent *eventPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((eventPtr->type == KeyRelease || eventPtr->type == KeyPress) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ((eventPtr->xany.serial-(unsigned int)serial) > 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((eventPtr->xany.serial-PTR2UINT(serial)) > 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TK_DEFER_EVENT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TK_PROCESS_EVENT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: generic/tkTable.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- generic/tkTable.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ generic/tkTable.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,10 +16,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _TKTABLE_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_INTTYPES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <tk.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef MAC_TCL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <Xatom.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <X11/Xatom.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,10 +51,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define EXTERN extern
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Macros used to cast between pointers and integers (e.g. when storing an int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * in ClientData), on 64-bit architectures they avoid gcc warning about "cast
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * to/from pointer from/to integer of different size".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(INT2PTR) && !defined(PTR2INT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(HAVE_INTPTR_T) || defined(intptr_t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define INT2PTR(p) ((void*)(intptr_t)(p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define PTR2INT(p) ((int)(intptr_t)(p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define INT2PTR(p) ((void*)(p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define PTR2INT(p) ((int)(p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(UINT2PTR) && !defined(PTR2UINT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(HAVE_UINTPTR_T) || defined(uintptr_t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define UINT2PTR(p) ((void*)(uintptr_t)(p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define PTR2UINT(p) ((unsigned int)(uintptr_t)(p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define UINT2PTR(p) ((void*)(p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define PTR2UINT(p) ((unsigned int)(p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef TCL_STORAGE_CLASS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # undef TCL_STORAGE_CLASS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef BUILD_Tktable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define TCL_STORAGE_CLASS DLLEXPORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: generic/tkTableCmds.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- generic/tkTableCmds.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ generic/tkTableCmds.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,12 +181,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (objc == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* print out all the preset column widths or row heights */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr = Tcl_FirstHashEntry(hashTablePtr, &search);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (entryPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- posn = ((int) Tcl_GetHashKey(hashTablePtr, entryPtr)) + offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- value = (int) Tcl_GetHashValue(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ posn = PTR2INT(Tcl_GetHashKey(hashTablePtr, entryPtr)) + offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ value = PTR2INT(Tcl_GetHashValue(entryPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sprintf(buf1, "%d %d", posn, value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* OBJECTIFY */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_AppendElement(interp, buf1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr = Tcl_NextHashEntry(&search);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,14 +195,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tcl_GetIntFromObj(interp, objv[2], &posn) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* no range check is done, why bother? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ posn -= offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entryPtr = Tcl_FindHashEntry(hashTablePtr, (char *) posn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entryPtr = Tcl_FindHashEntry(hashTablePtr, INT2PTR(posn));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetIntObj(Tcl_GetObjResult(interp),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (int) Tcl_GetHashValue(entryPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PTR2INT(Tcl_GetHashValue(entryPtr)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetIntObj(Tcl_GetObjResult(interp), widthType ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tablePtr->defColWidth : tablePtr->defRowHeight);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -215,18 +215,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ posn -= offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (value == -999999) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* reset that field */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entryPtr = Tcl_FindHashEntry(hashTablePtr, (char *) posn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entryPtr = Tcl_FindHashEntry(hashTablePtr, INT2PTR(posn));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteHashEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr = Tcl_CreateHashEntry(hashTablePtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *) posn, &dummy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INT2PTR(posn), &dummy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_SetHashValue(entryPtr, (ClientData) value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetHashValue(entryPtr, INT2PTR(value));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableAdjustParams(tablePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* rerequest geometry */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableGeometryRequest(tablePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -411,14 +411,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* row border was active, move it */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ value = y-h;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (value < -1) value = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (value != tablePtr->scanMarkY) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr = Tcl_CreateHashEntry(tablePtr->rowHeights,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *) row, &dummy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INT2PTR(row), &dummy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -value means rowHeight will be interp'd as pixels, not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lines */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_SetHashValue(entryPtr, (ClientData) MIN(0,-value));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetHashValue(entryPtr, INT2PTR(MIN(0,-value)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tablePtr->scanMarkY = value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (col >= 0 && (tablePtr->resize & SEL_COL)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -425,14 +425,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* col border was active, move it */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ value = x-w;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (value < -1) value = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (value != tablePtr->scanMarkX) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr = Tcl_CreateHashEntry(tablePtr->colWidths,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *) col, &dummy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INT2PTR(col), &dummy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -value means colWidth will be interp'd as pixels, not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chars */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_SetHashValue(entryPtr, (ClientData) MIN(0,-value));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetHashValue(entryPtr, INT2PTR(MIN(0,-value)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tablePtr->scanMarkX = value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Only if something changed do we want to update */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -547,18 +547,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (row = r1; row <= r2; row++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Note that *Styles entries are user based (no offset)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * while size entries are 0-based (real) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((cmdIndex == CLEAR_TAGS || cmdIndex == CLEAR_ALL) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (entryPtr = Tcl_FindHashEntry(tablePtr->rowStyles,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *) row))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INT2PTR(row)))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteHashEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ redraw = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((cmdIndex == CLEAR_SIZES || cmdIndex == CLEAR_ALL) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (entryPtr = Tcl_FindHashEntry(tablePtr->rowHeights,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *) row-tablePtr->rowOffset))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INT2PTR(row-tablePtr->rowOffset)))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteHashEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ redraw = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (col = c1; col <= c2; col++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -565,11 +565,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableMakeArrayIndex(row, col, buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cmdIndex == CLEAR_TAGS || cmdIndex == CLEAR_ALL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((row == r1) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (entryPtr = Tcl_FindHashEntry(tablePtr->colStyles,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *) col))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INT2PTR(col)))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteHashEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ redraw = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((entryPtr = Tcl_FindHashEntry(tablePtr->cellStyles,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buf))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -588,12 +588,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((cmdIndex == CLEAR_SIZES || cmdIndex == CLEAR_ALL) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ row == r1 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (entryPtr = Tcl_FindHashEntry(tablePtr->colWidths, (char *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- col-tablePtr->colOffset))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (entryPtr = Tcl_FindHashEntry(tablePtr->colWidths,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INT2PTR(col-tablePtr->colOffset)))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteHashEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ redraw = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((cmdIndex == CLEAR_CACHE || cmdIndex == CLEAR_ALL) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: generic/tkTableEdit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- generic/tkTableEdit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ generic/tkTableEdit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -603,28 +603,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * If -holdtags is specified, we don't move the user-set widths/heights
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * of the absolute rows/columns, otherwise we enter here to move the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * dimensions appropriately
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(flags & HOLD_TAGS)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entryPtr = Tcl_FindHashEntry(tagTblPtr, (char *)from);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entryPtr = Tcl_FindHashEntry(tagTblPtr, INT2PTR(from));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteHashEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entryPtr = Tcl_FindHashEntry(dimTblPtr, (char *)from-offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entryPtr = Tcl_FindHashEntry(dimTblPtr, INT2PTR(from-offset));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteHashEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!outOfBounds) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entryPtr = Tcl_FindHashEntry(tagTblPtr, (char *)to);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entryPtr = Tcl_FindHashEntry(tagTblPtr, INT2PTR(to));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- newPtr = Tcl_CreateHashEntry(tagTblPtr, (char *)from, &new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ newPtr = Tcl_CreateHashEntry(tagTblPtr, INT2PTR(from), &new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetHashValue(newPtr, Tcl_GetHashValue(entryPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteHashEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entryPtr = Tcl_FindHashEntry(dimTblPtr, (char *)to-offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entryPtr = Tcl_FindHashEntry(dimTblPtr, INT2PTR(to-offset));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- newPtr = Tcl_CreateHashEntry(dimTblPtr, (char *)from-offset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ newPtr = Tcl_CreateHashEntry(dimTblPtr, INT2PTR(from-offset),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetHashValue(newPtr, Tcl_GetHashValue(entryPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteHashEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: generic/tkTableTag.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- generic/tkTableTag.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ generic/tkTableTag.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -573,11 +573,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_HashEntry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableTag *tagPtr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr = Tcl_FindHashEntry((mode == ROW) ? tablePtr->rowStyles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : tablePtr->colStyles, (char *) cell);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : tablePtr->colStyles, INT2PTR(cell));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *cmd = (mode == ROW) ? tablePtr->rowTagCmd : tablePtr->colTagCmd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cmd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Tcl_Interp *interp = tablePtr->interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char buf[INDEX_BUFSIZE];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -869,11 +869,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scanPtr = Tcl_NextHashEntry(&search)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableParseArrayIndex(&row, &col,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_GetHashKey(hashTblPtr, scanPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ value = forRows ? row : col;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr = Tcl_CreateHashEntry(cacheTblPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *)value, &newEntry);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INT2PTR(value), &newEntry);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (newEntry) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_ListObjAppendElement(NULL, resultPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_NewIntObj(value));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -902,11 +902,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scanPtr != NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scanPtr = Tcl_NextHashEntry(&search)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* is this the tag pointer on this row */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((TableTag *) Tcl_GetHashValue(scanPtr) == tagPtr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objPtr = Tcl_NewIntObj(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (int) Tcl_GetHashKey(hashTblPtr, scanPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PTR2INT(Tcl_GetHashKey(hashTblPtr, scanPtr)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_ListObjAppendElement(NULL, resultPtr, objPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -924,11 +924,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tagPtr == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This is a deletion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entryPtr = Tcl_FindHashEntry(hashTblPtr, (char *)value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ entryPtr = Tcl_FindHashEntry(hashTblPtr, INT2PTR(value));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteHashEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ refresh = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -935,11 +935,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Add a key to the hash table and set it to point to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Tag structure if it wasn't the same as an existing one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr = Tcl_CreateHashEntry(hashTblPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *) value, &newEntry);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INT2PTR(value), &newEntry);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (newEntry || (tagPtr !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (TableTag *) Tcl_GetHashValue(entryPtr))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetHashValue(entryPtr, (ClientData) tagPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ refresh = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: generic/tkTableUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- generic/tkTableUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ generic/tkTableUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,11 +78,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *widgRec; /* Pointer to record for item. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset; /* Offset into item. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **borderStr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int *bordersPtr, *bdPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int type = (int) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int type = PTR2INT(clientData);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int result = TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONST84 char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((type == BD_TABLE) && (value[0] == '\0')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,11 +177,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset; /* Offset into item. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_FreeProc **freeProcPtr; /* Pointer to variable to fill in with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * information about how to reclaim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * storage for return string. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- register int type = (int) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ register int type = PTR2INT(clientData);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (type == BD_TABLE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ((TableTag *) (widgRec + offset))->borderStr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (type == BD_TABLE_TAG) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ((TableTag *) widgRec)->borderStr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tktable/files/patch-quartz.diff b/x11/tktable/files/patch-quartz.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b2f7a72449..0fd238ae25c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tktable/files/patch-quartz.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tktable/files/patch-quartz.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- generic/tkTable.h.orig 2005-02-01 21:22:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ generic/tkTable.h 2018-11-12 07:49:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,11 +19,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- generic/tkTable.h.orig 2020-11-13 05:04:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ generic/tkTable.h 2020-11-13 20:50:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,11 +22,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span> #include <tk.h>
-#ifdef MAC_TCL
-# include <Xatom.h>
</pre><pre style='margin:0'>
</pre>