[SCM] Seamless communication between many kinds of Unix branch, master, updated. 7146cc0a9bfd7310b19cd01f76c0fe9ab9b886e4

[Ole Streicher]

The following commit has been merged in the master branch:
commit 7146cc0a9bfd7310b19cd01f76c0fe9ab9b886e4
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Jun 9 10:42:04 2012 +0200

    Silence W-pointer-cast-size-mismatch

diff --git a/debian/patches/install_tclxpa.patch b/debian/patches/install_tclxpa.patch
index 1c969fd..7747716 100644
--- a/debian/patches/install_tclxpa.patch
+++ b/debian/patches/install_tclxpa.patch
@@ -3,7 +3,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  Debians policy.
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -38,6 +38,7 @@ INSTALL_ROOT =
+@@ -38,6 +38,7 @@
  
  # Directory in which to install the .a or .so binary for the XPA library:
  LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
@@ -11,7 +11,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  
  # Directory in which to install the program wish:
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
-@@ -142,7 +143,7 @@ GTK_OBJS =	gtkloop.o
+@@ -142,7 +143,7 @@
  INCL	=	xpa.h xpap.h
  
  # these are all the modules going into the "normal" xpa library
@@ -20,7 +20,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  LIB =	libxpa.a
  
  # used in link line
-@@ -167,6 +168,8 @@ install::	install-man
+@@ -167,6 +168,8 @@
  
  install::	install-share
  
@@ -29,7 +29,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  lib:		$(LIB) $(DOSHARED)
  
  $(LIB):		$(LIBOBJS)
-@@ -191,14 +194,17 @@ mingw-dll:	$(LIBOBJS)
+@@ -191,14 +194,17 @@
  		-e _LibMain at 12 -Wl,--image-base,0x1C000000 -o libxpa.dll \
  		-luser32 -lwsock32
  
@@ -55,7 +55,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  
  diff:
  		-(for f in `ls *.c`;					\
-@@ -257,7 +267,7 @@ smoke:  ctest stest
+@@ -257,7 +263,7 @@
  _install:
  
  shlib_install:
@@ -64,7 +64,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  	   do \
  	   if [ -h $$i ] ; then \
  		echo "Installing link $$i" ; \
-@@ -269,6 +279,11 @@ shlib_install:
+@@ -269,6 +275,11 @@
  	   fi; \
  	   done;)
  
@@ -76,3 +76,23 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  install-binaries: $(LIB) $(PROGS)
  	@for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
+--- a/tcl.c
++++ b/tcl.c
+@@ -971,7 +971,7 @@
+     /* create new tcl variable for this socket */
+     else{
+       /* create a tcl channel corresponding to the xpa socket */
+-      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)xpa_cmdfd(xpa))) ){
++      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)(intptr_t)xpa_cmdfd(xpa))) ){
+ 	Tcl_SetResult(interp, "XPA$ERROR: could not map XPA cmdfd to tcl",
+ 		      TCL_STATIC);
+ 	result = TCL_ERROR;
+@@ -1013,7 +1013,7 @@
+     }
+     /* create new tcl variable for this socket */
+     else{
+-      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)xpa_datafd(xpa))) ){
++      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)(intptr_t)xpa_datafd(xpa))) ){
+ 	Tcl_SetResult(interp, "XPA$ERROR: could not map XPA datafd to tcl",
+ 		      TCL_STATIC);
+ 	result = TCL_ERROR;

-- 
Seamless communication between many kinds of Unix