icon 9.5.0

5 files changed, 35 insertions, 442 deletions

diff --git a/debian/patches/config-illumos.patch b/debian/patches/config-illumos.patch
index 61ee4d2..6e1c6af 100644
--- a/debian/patches/config-illumos.patch
+++ b/debian/patches/config-illumos.patch
@@ -1,7 +1,7 @@
 Index: icon/config/illumos/Makedefs
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ icon/config/illumos/Makedefs	2013-01-28 05:28:17.202012546 +0000
++++ icon/config/illumos/Makedefs	2013-01-28 19:10:36.407878149 +0000
 @@ -0,0 +1,19 @@
 +#  CC       C compiler
 +#  CFLAGS   flags for building C files
@@ -15,7 +15,7 @@ Index: icon/config/illumos/Makedefs
 +
 +CC = gcc
 +CFDYN = -fPIC
-+CFLAGS = -D_XOPEN_SOURCE=500
++CFLAGS =
 +RLINK =
 +RLIBS = -lm
 +TLIBS =
@@ -25,143 +25,18 @@ Index: icon/config/illumos/Makedefs
 Index: icon/config/illumos/define.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ icon/config/illumos/define.h	2013-01-28 05:28:17.203439124 +0000
-@@ -0,0 +1,10 @@
++++ icon/config/illumos/define.h	2013-01-28 19:10:02.912492510 +0000
+@@ -0,0 +1,6 @@
 +/*
 + * Icon configuration file for Sun Solaris using Gnu C compiler
 + */
 +
 +#define UNIX 1
 +#define LoadFunc
-+
-+/* use gcc to compile generated code */
-+#define CComp "gcc"
-+#define COpts "-I/usr/openwin/include -ldl"
-Index: icon/config/illumos/i386.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ icon/config/illumos/i386.c	2013-01-28 05:33:19.286991222 +0000
-@@ -0,0 +1,72 @@
-+/*
-+ * Coswitch for Windows using Visual C++.
-+ *
-+ * Written by Frank J. Lhota, based on an assembly version
-+ * authored by Robert Goldberg and modified for OS/2 2.0 by Mark
-+ * Emmer.
-+ */
-+
-+#include <stdlib.h>
-+#include <sys/asm_linkage.h>
-+#include <sys/trap.h>
-+
-+/*
-+ * The Windows co-expression context consists of 5 words. The
-+ * following constants define the byte offsets for each of the
-+ * registers stored in the context.
-+ */
-+
-+#define SP_OFF "0"
-+#define BP_OFF "4"
-+#define SI_OFF "8"
-+#define DI_OFF "12"
-+#define BX_OFF "16"
-+
-+int	coswitch(old, new, first)
-+int	*old;
-+int	*new;
-+int	first;
-+{
-+
-+   /* Save current context to *old */
-+   __asm__ __volatile__ (
-+      "movl %%esp," SP_OFF "(%0)\n\t"
-+      "movl %%ebp," BP_OFF "(%0)\n\t"
-+      "movl %%esi," SI_OFF "(%0)\n\t"
-+      "movl %%edi," DI_OFF "(%0)\n\t"
-+      "movl %%ebx," BX_OFF "(%0)"
-+      : : "a"( old )
-+	  );
-+
-+   if ( first )
-+      {
-+      /* first != 0 => restore context in *new. */
-+	  __asm__ __volatile__ (
-+	     "movl " SP_OFF "(%0),%%esp\n\t"
-+	     "movl " BP_OFF "(%0),%%ebp\n\t"
-+	     "movl " SI_OFF "(%0),%%esi\n\t"
-+	     "movl " DI_OFF "(%0),%%edi\n\t"
-+	     "movl " BX_OFF "(%0),%%ebx"
-+	     : : "a"( new )
-+	     );
-+      }
-+   else
-+      {
-+      /*
-+       * first == 0 => Set things up for first activation of this
-+       *	       coexpression. Load stack pointer from first
-+       *	       word of *new and call new_context, which
-+       *	       should never return.
-+       */
-+	  __asm__ __volatile__ (
-+	     "movl " SP_OFF "(%0),%%esp\n\t"
-+	     "movl %%esp,%%ebp"
-+	     : : "a"( new )
-+	     );
-+      new_context( 0, NULL );
-+      syserr( "interp() returned in coswitch" );
-+      }
-+
-+   return 0;
-+}
-+
-Index: icon/config/illumos/sparc.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ icon/config/illumos/sparc.c	2013-01-28 05:28:17.206221785 +0000
-@@ -0,0 +1,39 @@
-+/*
-+ * coswitch for Sun-4 Sparc.
-+ *
-+ * Compile this with 'gcc -c rswitch.c'.  Do not use gcc -O.
-+ */
-+
-+#include <sys/asm_linkage.h>
-+#include <sys/trap.h>
-+
-+int coswitch(old_cs, new_cs, first)
-+int *old_cs, *new_cs;
-+int first;
-+{
-+   asm("ta	0x03");			/* ST_FLUSH_WINDOWS in trap.h     */
-+   asm("ld	[%fp+0x44], %o0");	/* load old_cs into %o0	          */
-+   asm("st	%sp,[%o0]");		/* Save user stack pointer        */
-+   asm("st	%fp,[%o0+0x4]");	/* Save frame pointer             */
-+   asm("st	%i7,[%o0+0x8]");	/* Save return address            */
-+
-+   if (first == 0) {			/* this is the first activation   */
-+      asm("ld	[%fp+0x48], %o0");	/* load new_cs into %o0           */
-+      asm("ld	[%o0], %o1");		/* load %o1 from cstate[0]        */
-+
-+      /* Decrement new stack pointer value before loading it into sp.	  */
-+      /* The top 64 bytes of the stack are reserved for the kernel, to    */
-+      /* save the 8 local and 8 in registers into, on context switches,   */
-+      /* interrupts, traps, etc.					  */
-+
-+      asm("save  %o1,-96, %sp");	/* load %sp from %o1	          */
-+      new_context(0,0);
-+      syserr("new_context() returned in coswitch");
-+
-+   } else {
-+      asm("ld	[%fp+0x48], %o0");	/* load new_cs into %o0           */
-+      asm("ld	[%o0+0x4],%fp");	/* Load frame pointer             */
-+      asm("ld	[%o0+0x8],%i7");	/* Load return address            */
-+      asm("ld	[%o0],%sp");		/* Load user stack pointer        */
-+   }
-+}
 Index: icon/config/illumos/status
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ icon/config/illumos/status	2013-01-28 05:28:17.207353708 +0000
++++ icon/config/illumos/status	2013-01-28 19:11:11.073674572 +0000
 @@ -0,0 +1,29 @@
 +System configuration:
 +
@@ -171,7 +46,7 @@ Index: icon/config/illumos/status
 +
 +Latest Icon version:
 +
-+       Version 9.4.3
++       Version 9.5.0
 +
 +Installer:
 +
diff --git a/debian/patches/fix-warnings.patch b/debian/patches/fix-warnings.patch
index 5e979fe..a7484ec 100644
--- a/debian/patches/fix-warnings.patch
+++ b/debian/patches/fix-warnings.patch
@@ -1,22 +1,7 @@
-Index: icon/src/common/infer.c
-===================================================================
---- icon.orig/src/common/infer.c	2002-04-11 23:41:08.000000000 +0000
-+++ icon/src/common/infer.c	2013-01-28 06:28:57.698559662 +0000
-@@ -23,8 +23,8 @@
-    assert (sizeof(int) >= 4);			/* need 32-bit ints or better */
-    assert (sizeof(long) <= 8);			/* but can't handle over 64 */
-    printf("/* generated by infer.c */\n");
--   printf("#define IntBits %d\n", 8 * sizeof(int));
--   printf("#define WordBits %d\n", 8 * sizeof(void *));
-+   printf("#define IntBits %d\n", 8 * (int)sizeof(int));
-+   printf("#define WordBits %d\n", 8 * (int)sizeof(void *));
-    if (offsetof(tstruct, d) > sizeof(void *))
-       printf("#define Double\n");
-    if (atdepth(2) > atdepth(1))
 Index: icon/src/xpm/data.c
 ===================================================================
---- icon.orig/src/xpm/data.c	2005-10-05 15:29:21.000000000 +0000
-+++ icon/src/xpm/data.c	2013-01-28 07:15:18.841563094 +0000
+--- icon.orig/src/xpm/data.c	2013-01-28 18:48:50.560689916 +0000
++++ icon/src/xpm/data.c	2013-01-28 19:08:40.943484565 +0000
 @@ -8,11 +8,6 @@
  *  Developed by Arnaud Le Hors                                                *
  \*****************************************************************************/
@@ -103,8 +88,8 @@ Index: icon/src/xpm/data.c
  }
 Index: icon/src/xpm/create.c
 ===================================================================
---- icon.orig/src/xpm/create.c	2005-10-05 15:29:21.000000000 +0000
-+++ icon/src/xpm/create.c	2013-01-28 06:45:50.887531187 +0000
+--- icon.orig/src/xpm/create.c	2013-01-28 18:48:50.560747560 +0000
++++ icon/src/xpm/create.c	2013-01-28 19:08:40.947269453 +0000
 @@ -260,7 +260,7 @@
  	    for (l = 0, cs = colorsymbols; l < numsymbols; l++, cs++)
  		if ((!cs->name && cs->value && cts[cts_index] &&
@@ -136,8 +121,8 @@ Index: icon/src/xpm/create.c
      /*
 Index: icon/src/xpm/misc.c
 ===================================================================
---- icon.orig/src/xpm/misc.c	2000-07-30 02:42:32.000000000 +0000
-+++ icon/src/xpm/misc.c	2013-01-28 06:47:53.666632432 +0000
+--- icon.orig/src/xpm/misc.c	2013-01-28 18:48:50.560638791 +0000
++++ icon/src/xpm/misc.c	2013-01-28 19:08:40.950369742 +0000
 @@ -14,7 +14,7 @@
   * Free the computed color table
   */
@@ -250,8 +235,8 @@ Index: icon/src/xpm/misc.c
  #ifdef NEED_STRDUP
 Index: icon/src/xpm/parse.c
 ===================================================================
---- icon.orig/src/xpm/parse.c	2000-07-30 02:42:32.000000000 +0000
-+++ icon/src/xpm/parse.c	2013-01-28 07:11:16.472740553 +0000
+--- icon.orig/src/xpm/parse.c	2013-01-28 18:48:50.560801268 +0000
++++ icon/src/xpm/parse.c	2013-01-28 19:08:40.953095572 +0000
 @@ -136,7 +136,7 @@
      /*
       * parse extensions
@@ -298,8 +283,8 @@ Index: icon/src/xpm/parse.c
  	   {
 Index: icon/src/xpm/xpmP.h
 ===================================================================
---- icon.orig/src/xpm/xpmP.h	2000-07-30 02:42:32.000000000 +0000
-+++ icon/src/xpm/xpmP.h	2013-01-28 07:15:17.804114555 +0000
+--- icon.orig/src/xpm/xpmP.h	2013-01-28 18:48:50.560850152 +0000
++++ icon/src/xpm/xpmP.h	2013-01-28 19:08:40.955816887 +0000
 @@ -173,6 +173,7 @@
  
  /* I/O utility */
@@ -317,8 +302,8 @@ Index: icon/src/xpm/xpmP.h
  #endif
 Index: icon/src/xpm/XpmWrFFrI.c
 ===================================================================
---- icon.orig/src/xpm/XpmWrFFrI.c	2000-07-30 02:42:32.000000000 +0000
-+++ icon/src/xpm/XpmWrFFrI.c	2013-01-28 07:42:05.840038776 +0000
+--- icon.orig/src/xpm/XpmWrFFrI.c	2013-01-28 18:48:50.560591340 +0000
++++ icon/src/xpm/XpmWrFFrI.c	2013-01-28 19:08:40.958310424 +0000
 @@ -63,7 +63,7 @@
  	else
  	    name++;
@@ -357,101 +342,8 @@ Index: icon/src/xpm/XpmWrFFrI.c
  	    }
 Index: icon/src/rtt/rttdb.c
 ===================================================================
---- icon.orig/src/rtt/rttdb.c	2002-04-11 20:50:17.000000000 +0000
-+++ icon/src/rtt/rttdb.c	2013-01-28 07:29:50.509893975 +0000
-@@ -542,7 +542,7 @@
-          fprintf(db, "%d ", num_cases);
-          indx = 1;
-          for (i = 0; i < num_cases; ++i) {
--            fprintf(db, "\n%d ", il->u[indx++].n);    /* selection number */
-+            fprintf(db, "\n%d ", (int)il->u[indx++].n);    /* selection number */
-             put_inlin(db, il->u[indx++].fld);        /* action */
-             }
-          fprintf(db, "\n");
-@@ -567,14 +567,14 @@
-           * runerr with no value argument.
-           */
-          fprintf(db, "runerr1 ");
--         fprintf(db, "%d ", il->u[0].n);      /* error number */
-+         fprintf(db, "%d ", (int)il->u[0].n);      /* error number */
-          break;
-       case IL_Err2:
-          /*
-           * runerr with a value argument.
-           */
-          fprintf(db, "runerr2 ");
--         fprintf(db, "%d ", il->u[0].n);      /* error number */
-+         fprintf(db, "%d ", (int)il->u[0].n);      /* error number */
-          put_inlin(db, il->u[1].fld);          /* variable */
-          break;
-       case IL_Lst:
-@@ -649,15 +649,15 @@
-          /*
-           * A variable.
-           */
--         fprintf(db, "%d ", il->u[0].n);    /* symbol table index */
-+         fprintf(db, "%d ", (int)il->u[0].n);    /* symbol table index */
-          break;
-       case IL_Subscr:
-          /*
-           * A subscripted variable.
-           */
-          fprintf(db, "[ ");
--         fprintf(db, "%d ", il->u[0].n);    /* symbol table index */
--         fprintf(db, "%d ", il->u[1].n);    /* subscripting index */
-+         fprintf(db, "%d ", (int)il->u[0].n);    /* symbol table index */
-+         fprintf(db, "%d ", (int)il->u[1].n);    /* subscripting index */
-          break;
-       case IL_Block:
-          /*
-@@ -671,7 +671,7 @@
-           /*
-            * Output a symbol table of tended variables.
-            */
--         fprintf(db, "%d ", il->u[1].n);    /* number of local tended */
-+         fprintf(db, "%d ", (int)il->u[1].n);    /* number of local tended */
-          for (i = 2; i - 2 < il->u[1].n; ++i)
-              switch (il->u[i].n) {
-                 case TndDesc:
-@@ -733,8 +733,8 @@
-          else
-             fprintf(db, "f ");
- 
--         fprintf(db, "%d ", il->u[5].n);    /* num string bufs */
--         fprintf(db, "%d ", il->u[6].n);    /* num cset bufs */
-+         fprintf(db, "%d ", (int)il->u[5].n);    /* num string bufs */
-+         fprintf(db, "%d ", (int)il->u[6].n);    /* num cset bufs */
-          i = il->u[7].n;
-          fprintf(db, "%d ", i);             /* num args */
-          indx = 8;
-@@ -961,15 +961,15 @@
-             fprintf(db, "$efail ");  /* errorfail statement */
-             break;
-          case ILC_Goto:
--            fprintf(db, "$goto %d ", ilc->n);  /* goto label */
-+            fprintf(db, "$goto %d ", (int)ilc->n);  /* goto label */
-             break;
-          case ILC_CGto:
-             fprintf(db, "$cgoto ");            /* conditional goto */
-             put_ilc(db, ilc->code[0]);         /* condition (with $c $e) */
--            fprintf(db, "%d ", ilc->n);        /* label */
-+            fprintf(db, "%d ", (int)ilc->n);        /* label */
-             break;
-          case ILC_Lbl:
--            fprintf(db, "$lbl %d ", ilc->n);   /* label */
-+            fprintf(db, "$lbl %d ", (int)ilc->n);   /* label */
-             break;
-          case ILC_LBrc:
-             fprintf(db, "${ ");                /* start of C block with dcls */
-@@ -1000,7 +1000,7 @@
-    if (ilc->n == RsltIndx)
-       fprintf(db, "r ");          /* this is "result" */
-    else
--      fprintf(db, "%d ", ilc->n); /* offset into a symbol table */
-+      fprintf(db, "%d ", (int)ilc->n); /* offset into a symbol table */
-    }
- 
- /*
+--- icon.orig/src/rtt/rttdb.c	2013-01-28 19:02:21.936306598 +0000
++++ icon/src/rtt/rttdb.c	2013-01-28 19:08:40.969697764 +0000
 @@ -1028,11 +1028,12 @@
        fprintf(db, "e");      /* can do error conversion */
     else
@@ -468,8 +360,8 @@ Index: icon/src/rtt/rttdb.c
  
 Index: icon/src/preproc/bldtok.c
 ===================================================================
---- icon.orig/src/preproc/bldtok.c	2001-12-12 18:28:12.000000000 +0000
-+++ icon/src/preproc/bldtok.c	2013-01-28 07:35:48.898131331 +0000
+--- icon.orig/src/preproc/bldtok.c	2013-01-28 18:48:50.560925838 +0000
++++ icon/src/preproc/bldtok.c	2013-01-28 19:08:40.975520305 +0000
 @@ -212,7 +212,7 @@
     /*
      * Look ahead to see if a ## operator is next.
@@ -535,8 +427,8 @@ Index: icon/src/preproc/bldtok.c
        default:
 Index: icon/src/preproc/macro.c
 ===================================================================
---- icon.orig/src/preproc/macro.c	2001-12-12 18:28:13.000000000 +0000
-+++ icon/src/preproc/macro.c	2013-01-28 07:36:19.080691786 +0000
+--- icon.orig/src/preproc/macro.c	2013-01-28 18:48:50.560876838 +0000
++++ icon/src/preproc/macro.c	2013-01-28 19:08:40.978091646 +0000
 @@ -270,7 +270,7 @@
     static char buf[20];
  
@@ -554,50 +446,11 @@ Index: icon/src/preproc/macro.c
     return m;
     }
  
-Index: icon/src/runtime/interp.r
-===================================================================
---- icon.orig/src/runtime/interp.r	2002-07-10 23:42:38.000000000 +0000
-+++ icon/src/runtime/interp.r	2013-01-28 08:04:40.576851911 +0000
-@@ -1601,7 +1601,7 @@
- 	    char buf[50];
- 
- 	    sprintf(buf, "unimplemented opcode: %ld (0x%08x)\n",
--               (long)lastop, lastop);
-+               (long)lastop, (unsigned int)lastop);
- 	    syserr(buf);
- 	    }
- 	 }
-Index: icon/src/runtime/rmisc.r
-===================================================================
---- icon.orig/src/runtime/rmisc.r	2004-11-18 17:13:16.000000000 +0000
-+++ icon/src/runtime/rmisc.r	2013-01-28 08:11:35.845335783 +0000
-@@ -683,7 +683,7 @@
-             putc(')', f);
-             }
-          else if (Type(*dp) == T_External)
--            fprintf(f, "external(%d)",((struct b_external *)BlkLoc(*dp))->blksize);
-+            fprintf(f, "external(%d)",(int)((struct b_external *)BlkLoc(*dp))->blksize);
-          else if (Type(*dp) <= MaxType)
-             fprintf(f, "%s", blkname[Type(*dp)]);
-          else
-Index: icon/src/runtime/rxrsc.ri
-===================================================================
---- icon.orig/src/runtime/rxrsc.ri	2003-04-24 20:41:19.000000000 +0000
-+++ icon/src/runtime/rxrsc.ri	2013-01-28 08:14:34.695479550 +0000
-@@ -685,7 +685,7 @@
-     */
-    p = xlfd_field(fontlist[champ], XLFD_Size);
-    if (p[0] == '0' && p[1] == '-')
--      sprintf(fontspec, "%.*s%d%s", p - fontlist[champ],
-+      sprintf(fontspec, "%.*s%d%s", (int)(p - fontlist[champ]),
-          fontlist[champ], bestsize, p + 1);
-    else
-       strcpy(fontspec, fontlist[champ]);
 Index: icon/ipl/cfuncs/icall.h
 ===================================================================
---- icon.orig/ipl/cfuncs/icall.h	2004-11-17 22:50:50.000000000 +0000
-+++ icon/ipl/cfuncs/icall.h	2013-01-28 08:39:11.130875411 +0000
-@@ -94,6 +94,7 @@
+--- icon.orig/ipl/cfuncs/icall.h	2013-01-28 19:02:21.860442103 +0000
++++ icon/ipl/cfuncs/icall.h	2013-01-28 19:08:41.001319232 +0000
+@@ -97,6 +97,7 @@
  
  #include <stdio.h>
  #include <limits.h>
@@ -605,136 +458,3 @@ Index: icon/ipl/cfuncs/icall.h
  
  #if INT_MAX == 32767
  #define WordSize 16
-Index: icon/src/iconc/ccode.c
-===================================================================
---- icon.orig/src/iconc/ccode.c	2002-07-10 16:49:38.000000000 +0000
-+++ icon/src/iconc/ccode.c	2013-01-28 08:35:30.801468796 +0000
-@@ -3719,7 +3719,7 @@
- int n;
-    {
-    struct code *cd;
--   static cnt=1;
-+   static int cnt=1;
- 
-    cd = NewCode(2 * n + 1);
-    cd->cd_id = C_CdAry;
-Index: icon/src/iconc/chkinv.c
-===================================================================
---- icon.orig/src/iconc/chkinv.c	2000-07-30 02:42:31.000000000 +0000
-+++ icon/src/iconc/chkinv.c	2013-01-28 08:36:46.476591093 +0000
-@@ -22,7 +22,7 @@
- static int     seq_exec (int exec_flg1, int exec_flg2);
- static int     spcl_inv (struct node *n, struct node *asgn);
- 
--static ret_flag;
-+static int ret_flag;
- 
- /*
-  * chkinv - check for invocation and assignment optimizations.
-Index: icon/src/iconc/codegen.c
-===================================================================
---- icon.orig/src/iconc/codegen.c	2000-07-30 02:42:32.000000000 +0000
-+++ icon/src/iconc/codegen.c	2013-01-28 08:36:25.540948861 +0000
-@@ -156,7 +156,7 @@
-       for (i = 0; i < GHSize; i++)
-          for (gptr = ghash[i]; gptr != NULL; gptr = gptr->blink)
-             if (!(gptr->flag & F_SmplInv))
--               fprintf(codefile, "   {%d, \"%s\"},\n", strlen(gptr->name),
-+               fprintf(codefile, "   {%d, \"%s\"},\n", (int)strlen(gptr->name),
-                   gptr->name);
-          fprintf(codefile, "   };\n");
-       }
-@@ -352,7 +352,7 @@
-       fprintf(inclfile, "dptr r_rslt, continuation r_s_cont);\n");
-       initpblk(inclfile, 'P', p->prefix, name, nquals, p->nargs, p->ndynam,
-          p->nstatic, n_stat + 1);
--      fprintf(inclfile, "\n   {%d, \"%s\"},\n", strlen(name), name);
-+      fprintf(inclfile, "\n   {%d, \"%s\"},\n", (int)strlen(name), name);
-       }
-    arg_nms(p->args, init_glbl);
-    p->tnd_loc = dyn_nms(p->dynams, init_glbl);
-@@ -376,7 +376,7 @@
-    n = arg_nms(lptr->next, prt);
-    lptr->val.index = n;
-    if (prt)
--      fprintf(inclfile, "   {%d, \"%s\"},\n", strlen(lptr->name), lptr->name);
-+      fprintf(inclfile, "   {%d, \"%s\"},\n", (int)strlen(lptr->name), lptr->name);
-    return n + 1;
-    }
- 
-@@ -395,7 +395,7 @@
-    n = dyn_nms(lptr->next, prt);
-    lptr->val.index = n;
-    if (prt)
--      fprintf(inclfile, "   {%d, \"%s\"},\n", strlen(lptr->name), lptr->name);
-+      fprintf(inclfile, "   {%d, \"%s\"},\n", (int)strlen(lptr->name), lptr->name);
-    return n + 1;
-    }
- 
-@@ -412,7 +412,7 @@
-    stat_nms(lptr->next, prt);
-    lptr->val.index = ++n_stat;
-    if (prt)
--      fprintf(inclfile, "   {%d, \"%s\"},\n", strlen(lptr->name), lptr->name);
-+      fprintf(inclfile, "   {%d, \"%s\"},\n", (int)strlen(lptr->name), lptr->name);
-    }
- 
- /*
-@@ -477,7 +477,7 @@
-    fprintf(inclfile, "\n");
-    implproto(ip);
-    initpblk(inclfile, 'F', prefix, name, 1, nargs, -1, 0, 0);
--   fprintf(inclfile, "{%d, \"%s\"}}};\n", strlen(name), name);
-+   fprintf(inclfile, "{%d, \"%s\"}}};\n", (int)strlen(name), name);
-    }
- 
- /*
-@@ -520,7 +520,7 @@
-     */
-    initpblk(inclfile, 'R', r->prefix, name, nfields + 1, nfields, -2,
-       r->rec_num, 1);
--   fprintf(inclfile, "\n   {%d, \"%s\"},\n", strlen(name), name);
-+   fprintf(inclfile, "\n   {%d, \"%s\"},\n", (int)strlen(name), name);
-    fldnames(r->fields);
-    fprintf(inclfile, "   }};\n");
-    }
-@@ -538,7 +538,7 @@
-       return;
-    fldnames(fields->next);
-    name = fields->name;
--   fprintf(inclfile, "   {%d, \"%s\"},\n", strlen(name), name);
-+   fprintf(inclfile, "   {%d, \"%s\"},\n", (int)strlen(name), name);
-    }
- 
- /*
-@@ -1048,7 +1048,7 @@
-                      fprintf(codefile, ".vword.sptr = \"%s\";\n", lit->image);
-                      fprintf(codefile, "   ");
-                      val_loc(cd->Rslt, outer);
--                     fprintf(codefile, ".dword = %d;\n", strlen(lit->image));
-+                     fprintf(codefile, ".dword = %d;\n", (int)strlen(lit->image));
-                      fprintf(codefile, "   cnv_int(&");
-                      val_loc(cd->Rslt, outer);
-                      fprintf(codefile, ", &");
-@@ -1193,7 +1193,7 @@
-              */
-             if (cd->FileName != NULL) {
-                fprintf(codefile, "   file_name = \"");
--               prt_i_str(codefile, cd->FileName, strlen(cd->FileName));
-+               prt_i_str(codefile, cd->FileName, (int)strlen(cd->FileName));
-                fprintf(codefile, "\";\n");
-                }
-             if (cd->LineNum != 0)
-Index: icon/src/iconc/csym.c
-===================================================================
---- icon.orig/src/iconc/csym.c	2000-07-30 02:42:32.000000000 +0000
-+++ icon/src/iconc/csym.c	2013-01-28 08:34:56.175244144 +0000
-@@ -821,7 +821,7 @@
-     *  invocation.
-     */
-    fprintf(codefile, "   {T_Proc, 11, O%c%c_%s, %d, -1, 0, 0, {{%d, \"", c1, c2,
--      name, nargs, strlen(op));
-+      name, nargs, (int)strlen(op));
-    for (s = op; *s != '\0'; ++s) {
-       if (*s == '\\')
-          fprintf(codefile, "\\");
diff --git a/debian/patches/series b/debian/patches/series
index 150d59a..ba113b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-debian-9.4.3-2.patch
 config-illumos.patch
-undefine-SHARED-if-defined.patch
 use-__fpending.patch
 dyson-mklib.sh-gcc.patch
 fix-warnings.patch
diff --git a/debian/patches/use-__fpending.patch b/debian/patches/use-__fpending.patch
index b23fb04..d69e245 100644
--- a/debian/patches/use-__fpending.patch
+++ b/debian/patches/use-__fpending.patch
@@ -1,17 +1,17 @@
 Description: Supported in GLIBC and in Solaris libc
 Index: icon/ipl/cfuncs/fpoll.c
 ===================================================================
---- icon.orig/ipl/cfuncs/fpoll.c	2003-01-10 17:48:57.000000000 +0000
-+++ icon/ipl/cfuncs/fpoll.c	2013-01-28 06:15:30.654169575 +0000
+--- icon.orig/ipl/cfuncs/fpoll.c	2013-01-28 19:02:21.859991668 +0000
++++ icon/ipl/cfuncs/fpoll.c	2013-01-28 19:07:16.982669113 +0000
 @@ -29,6 +29,7 @@
  */
  
  #include <stdio.h>
 +#include <stdio_ext.h>
+ #include <string.h>	/* for memset call from FD_ZERO (solaris gcc) */
  #include <sys/types.h>
  #include <sys/time.h>
- 
-@@ -57,21 +58,8 @@
+@@ -58,21 +59,8 @@
        msec = IntegerVal(argv[2]);
        }
  
diff --git a/debian/rules b/debian/rules
index ba6dc79..95782a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -223,18 +223,18 @@ benchmark-iconc: build-iconc
 	$(MAKE) Benchmark-icont	
 
 build-iconx: build-icont
-build: build-icont build-iconc build-ipl
+build: build-icont build-ipl
 
-binary-arch: binary-icont binary-iconx binary-iconc
+binary-arch: binary-icont binary-iconx
 
 binary-indep: binary-ipl
 	$(checkroot)
 
 binary: binary-indep binary-arch
 
-test: test-icont test-iconc
+test: test-icont
 
-benchmark: benchmark-icont behchmark-iconc
+benchmark: benchmark-icont
 
 define checkdir
 	test -f src/icont/tmem.c -a -f debian/rules