From 4bd65aaa0af98a2fd5e1d93321ef1e5a0d56d350 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Mon, 14 Aug 2017 13:56:19 -0400
Subject: Squashed 'tcliis/' changes from 3cc68fd9..ca9787ee

ca9787ee fix clean xxConfig.sh issue
0d5729ec fix win64 issue

git-subtree-dir: tcliis
git-subtree-split: ca9787ee2d50a9ee1f8ffb3cf4f6cd217edc58bd
---
 configure    | 1 -
 configure.ac | 1 -
 xim.C        | 8 ++++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 912c7a2..80d2318 100755
--- a/configure
+++ b/configure
@@ -5479,7 +5479,6 @@ done
 #--------------------------------------------------------------------
 
 #CLEANFILES="$CLEANFILES pkgIndex.tcl"
-CLEANFILES="$CLEANFILES tcliisConfig.sh"
 if test "${TEA_PLATFORM}" = "windows" ; then
     # Ensure no empty if clauses
     :
diff --git a/configure.ac b/configure.ac
index b25e69c..9fbd92e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,6 @@ TEA_ADD_TCL_SOURCES([])
 #--------------------------------------------------------------------
 
 #CLEANFILES="$CLEANFILES pkgIndex.tcl"
-CLEANFILES="$CLEANFILES tcliisConfig.sh"
 if test "${TEA_PLATFORM}" = "windows" ; then
     # Ensure no empty if clauses
     :
diff --git a/xim.C b/xim.C
index ecbeeed..8fcc2db 100644
--- a/xim.C
+++ b/xim.C
@@ -25,7 +25,11 @@ extern "C" {
 
 void iisIO(ClientData data, int mask)
 {
+#ifdef _WIN64
+  int fd = (long long)data;
+#else
   int fd = (long)data;
+#endif
 
   if (IISDebug)
     cerr << "iisIO() " << fd << ' ' << mask << endl;
@@ -81,7 +85,11 @@ void setupProc(void* fd, int flags)
 
 void checkProc(void* fdd, int flags)
 {
+#ifdef __WIN32
+  int fd = (long long)fdd;
+#else
   int fd = (int)fdd;
+#endif
   fd_set readfds;
   struct timeval tv = {0,0};
 
-- 
cgit v0.12