From 65a54924d6c225c4e4d5b651301fe311768960ce Mon Sep 17 00:00:00 2001
From: Per Hedbor <ph@opera.com>
Date: Thu, 10 Aug 2000 11:51:57 +0200
Subject: [PATCH] int-> INT_TYPE and float-> FLOAT_TYPE for (I hope) all
 get_all_args calls.

Rev: src/builtin_functions.c:1.295
Rev: src/encode.c:1.64
Rev: src/error.c:1.57
Rev: src/modules/Gettext/gettext.c:1.5
Rev: src/modules/Gmp/mpz_glue.c:1.81
Rev: src/modules/HTTPLoop/accept_and_parse.c:1.16
Rev: src/modules/HTTPLoop/requestobject.c:1.12
Rev: src/modules/Image/blit.c:1.45
Rev: src/modules/Image/colors.c:1.35
Rev: src/modules/Image/colortable.c:1.86
Rev: src/modules/Image/encodings/_xpm.c:1.14
Rev: src/modules/Image/encodings/psd.c:1.21
Rev: src/modules/Image/encodings/xcf.c:1.19
Rev: src/modules/Image/font.c:1.61
Rev: src/modules/Image/image.c:1.173
Rev: src/modules/Image/layers.c:1.53
Rev: src/modules/Math/math_matrix.c:1.16
Rev: src/modules/SANE/sane.c:1.7
Rev: src/modules/_Crypto/nt.c:1.6
Rev: src/modules/_Crypto/rsa.c:1.23
Rev: src/modules/_Image_JPEG/image_jpeg.c:1.32
Rev: src/modules/files/termios.c:1.9
Rev: src/modules/spider/spider.c:1.97
Rev: src/modules/system/nt.c:1.21
Rev: src/modules/system/passwords.c:1.30
Rev: src/modules/system/syslog.c:1.9
Rev: src/modules/system/system.c:1.86
Rev: src/opcodes.c:1.82
Rev: src/operators.c:1.97
Rev: src/post_modules/GTK/build_pgtk.pike:1.32
Rev: src/post_modules/GTK/source/gdkatom.pre:1.6
Rev: src/post_modules/GTK/source/gdkbitmap.pre:1.7
Rev: src/post_modules/GTK/source/gdkcolor.pre:1.6
Rev: src/post_modules/GTK/source/gdkdragcontext.pre:1.6
Rev: src/post_modules/GTK/source/gdkdrawable.pre:1.6
Rev: src/post_modules/GTK/source/gdkgc.pre:1.6
Rev: src/post_modules/GTK/source/gdkimage.pre:1.7
Rev: src/post_modules/GTK/source/gdkrectangle.pre:1.6
Rev: src/post_modules/GTK/source/gdkregion.pre:1.6
Rev: src/post_modules/GTK/source/gdkwindow.pre:1.10
Rev: src/post_modules/GTK/source/global.pre:1.13
Rev: src/post_modules/GTK/source/gnomeapp.pre:1.6
Rev: src/post_modules/GTK/source/gnomecanvas.pre:1.3
Rev: src/post_modules/GTK/source/gnomecanvasgroup.pre:1.4
Rev: src/post_modules/GTK/source/gnomeiconlist.pre:1.4
Rev: src/post_modules/GTK/source/gtkaccelgroup.pre:1.5
Rev: src/post_modules/GTK/source/gtkadjustment.pre:1.5
Rev: src/post_modules/GTK/source/gtkcalendar.pre:1.3
Rev: src/post_modules/GTK/source/gtkclist.pre:1.6
Rev: src/post_modules/GTK/source/gtkctree.pre:1.5
Rev: src/post_modules/GTK/source/gtkcurve.pre:1.5
Rev: src/post_modules/GTK/source/gtkdrawingarea.pre:1.3
Rev: src/post_modules/GTK/source/gtklist.pre:1.5
Rev: src/post_modules/GTK/source/gtkmenu.pre:1.3
Rev: src/post_modules/GTK/source/gtkobject.pre:1.4
Rev: src/post_modules/GTK/source/gtkwidget.pre:1.7
Rev: src/post_modules/GTK/source/support.c:1.16
Rev: src/program.c:1.254
Rev: src/signal_handler.c:1.174
Rev: src/threads.c:1.134
---
 src/builtin_functions.c                       | 10 +++----
 src/encode.c                                  |  4 +--
 src/error.c                                   |  4 +--
 src/modules/Gettext/gettext.c                 |  8 ++---
 src/modules/Gmp/mpz_glue.c                    | 10 +++----
 src/modules/HTTPLoop/accept_and_parse.c       |  6 ++--
 src/modules/HTTPLoop/requestobject.c          |  4 +--
 src/modules/Image/blit.c                      |  8 ++---
 src/modules/Image/colors.c                    | 24 +++++++--------
 src/modules/Image/colortable.c                | 10 +++----
 src/modules/Image/encodings/_xpm.c            |  4 +--
 src/modules/Image/encodings/psd.c             |  6 ++--
 src/modules/Image/encodings/xcf.c             |  6 ++--
 src/modules/Image/font.c                      |  6 ++--
 src/modules/Image/image.c                     | 10 +++----
 src/modules/Image/layers.c                    | 29 +++++++++----------
 src/modules/Math/math_matrix.c                |  4 +--
 src/modules/SANE/sane.c                       |  8 ++---
 src/modules/_Crypto/nt.c                      |  4 +--
 src/modules/_Crypto/rsa.c                     |  8 ++---
 src/modules/_Image_JPEG/image_jpeg.c          |  6 ++--
 src/modules/files/termios.c                   |  4 +--
 src/modules/spider/spider.c                   |  8 ++---
 src/modules/system/nt.c                       |  8 ++---
 src/modules/system/passwords.c                |  8 ++---
 src/modules/system/syslog.c                   | 10 +++----
 src/modules/system/system.c                   | 26 ++++++++---------
 src/opcodes.c                                 | 10 +++----
 src/operators.c                               |  6 ++--
 src/post_modules/GTK/build_pgtk.pike          | 16 +++++-----
 src/post_modules/GTK/source/gdkatom.pre       |  2 +-
 src/post_modules/GTK/source/gdkbitmap.pre     |  2 +-
 src/post_modules/GTK/source/gdkcolor.pre      |  2 +-
 .../GTK/source/gdkdragcontext.pre             | 10 +++----
 src/post_modules/GTK/source/gdkdrawable.pre   | 20 ++++++-------
 src/post_modules/GTK/source/gdkgc.pre         |  6 ++--
 src/post_modules/GTK/source/gdkimage.pre      |  8 ++---
 src/post_modules/GTK/source/gdkrectangle.pre  | 17 ++++++++---
 src/post_modules/GTK/source/gdkregion.pre     |  6 ++--
 src/post_modules/GTK/source/gdkwindow.pre     | 18 ++++++------
 src/post_modules/GTK/source/global.pre        |  4 +--
 src/post_modules/GTK/source/gnomeapp.pre      |  2 +-
 src/post_modules/GTK/source/gnomecanvas.pre   |  2 +-
 .../GTK/source/gnomecanvasgroup.pre           |  2 +-
 src/post_modules/GTK/source/gnomeiconlist.pre |  8 ++---
 src/post_modules/GTK/source/gtkaccelgroup.pre |  8 ++---
 src/post_modules/GTK/source/gtkadjustment.pre |  2 +-
 src/post_modules/GTK/source/gtkcalendar.pre   |  2 +-
 src/post_modules/GTK/source/gtkclist.pre      | 26 ++++++++---------
 src/post_modules/GTK/source/gtkctree.pre      | 10 +++----
 src/post_modules/GTK/source/gtkcurve.pre      |  2 +-
 .../GTK/source/gtkdrawingarea.pre             | 22 +++++++-------
 src/post_modules/GTK/source/gtklist.pre       |  2 +-
 src/post_modules/GTK/source/gtkmenu.pre       |  2 +-
 src/post_modules/GTK/source/gtkobject.pre     |  6 ++--
 src/post_modules/GTK/source/gtkwidget.pre     | 14 ++++-----
 src/post_modules/GTK/source/support.c         |  2 +-
 src/program.c                                 |  4 +--
 src/signal_handler.c                          |  4 +--
 src/threads.c                                 |  4 +--
 60 files changed, 250 insertions(+), 244 deletions(-)

diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index afe05bd8e5..e3cef7ee9a 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: builtin_functions.c,v 1.294 2000/08/02 20:31:51 hubbe Exp $");
+RCSID("$Id: builtin_functions.c,v 1.295 2000/08/10 09:51:51 per Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "pike_macros.h"
@@ -272,7 +272,7 @@ static struct case_info *find_ci_shift0(int c)
 
 PMOD_EXPORT void f_lower_case(INT32 args)
 {
-  INT32 i;
+  INT_TYPE i;
   struct pike_string *orig;
   struct pike_string *ret;
   get_all_args("lower_case", args, "%W", &orig);
@@ -311,7 +311,7 @@ PMOD_EXPORT void f_lower_case(INT32 args)
 
 PMOD_EXPORT void f_upper_case(INT32 args)
 {
-  INT32 i;
+  INT_TYPE i;
   struct pike_string *orig;
   struct pike_string *ret;
   int widen = 0;
@@ -397,7 +397,7 @@ PMOD_EXPORT void f_random(INT32 args)
 PMOD_EXPORT void f_random_string(INT32 args)
 {
   struct pike_string *ret;
-  INT32 e,len;
+  INT_TYPE len, e;
   get_all_args("random_string",args,"%i",&len);
   ret = begin_shared_string(len);
   for(e=0;e<len;e++) ret->str[e]=my_rand();
@@ -1588,7 +1588,7 @@ PMOD_EXPORT void f_time(INT32 args)
       tmp.tv_usec=0;
       my_subtract_timeval(&tmp,&current_time);
       pop_n_elems(args);
-      push_float( - (float)tmp.tv_sec - ((float)tmp.tv_usec)/1000000 );
+      push_float( - (FLOAT_TYPE)tmp.tv_sec-((FLOAT_TYPE)tmp.tv_usec)/1000000 );
       return;
     }
   }
diff --git a/src/encode.c b/src/encode.c
index 57db65daaf..a98b6c092d 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -25,7 +25,7 @@
 #include "version.h"
 #include "bignum.h"
 
-RCSID("$Id: encode.c,v 1.63 2000/08/10 09:01:00 grubba Exp $");
+RCSID("$Id: encode.c,v 1.64 2000/08/10 09:51:51 per Exp $");
 
 /* #define ENCODE_DEBUG */
 
@@ -64,7 +64,7 @@ double FREXP(double x, int *exp)
 {
   double ret;
   *exp=(int)ceil(log(fabs(x))/log(2.0));
-  ret=(x*pow(2.0,(float)-*exp));
+  ret=(x*pow(2.0,(FLOAT_TYPE)-*exp));
   return ret;
 }
 #endif
diff --git a/src/error.c b/src/error.c
index a88fbf7e83..ff11cf96f2 100644
--- a/src/error.c
+++ b/src/error.c
@@ -21,7 +21,7 @@
 #include "threads.h"
 #include "gc.h"
 
-RCSID("$Id: error.c,v 1.56 2000/07/28 17:16:54 hubbe Exp $");
+RCSID("$Id: error.c,v 1.57 2000/08/10 09:51:51 per Exp $");
 
 #undef ATTRIBUTE
 #define ATTRIBUTE(X)
@@ -332,7 +332,7 @@ void f_error_cast(INT32 args)
 
 void f_error_index(INT32 args)
 {
-  int ind;
+  INT_TYPE ind;
   get_all_args("error->`[]",args,"%i",&ind);
 
   switch(ind)
diff --git a/src/modules/Gettext/gettext.c b/src/modules/Gettext/gettext.c
index d3f1f61e4a..ad24af35b7 100644
--- a/src/modules/Gettext/gettext.c
+++ b/src/modules/Gettext/gettext.c
@@ -23,7 +23,7 @@
 /* This must be included last */
 #include "module_magic.h"
 
-RCSID("$Id: gettext.c,v 1.4 2000/07/28 07:12:00 hubbe Exp $");
+RCSID("$Id: gettext.c,v 1.5 2000/08/10 09:51:52 per Exp $");
 
 /*
 **! module Locale.Gettext
@@ -31,7 +31,7 @@ RCSID("$Id: gettext.c,v 1.4 2000/07/28 07:12:00 hubbe Exp $");
 **!	This module enables access to localization functions from within Pike.
 **!
 **! note
-**!	$Id: gettext.c,v 1.4 2000/07/28 07:12:00 hubbe Exp $
+**!	$Id: gettext.c,v 1.5 2000/08/10 09:51:52 per Exp $
 */
 
 /******************** PUBLIC FUNCTIONS BELOW THIS LINE */
@@ -108,7 +108,7 @@ void f_dcgettext(INT32 args)
 {
   char *translated;
   struct pike_string *domain, *msg;
-  int category;
+  INT_TYPE category;
   get_all_args("Gettext.dcgettext", args, "%S%S%d", &domain, &msg, &category);
 
   translated = dcgettext(domain->str, msg->str, category);
@@ -257,7 +257,7 @@ void f_setlocale(INT32 args)
 {
   char *returnstring;
   struct pike_string *locale;
-  int category;
+  INT_TYPE category;
   get_all_args("Gettext.setlocale", args, "%d%S", &category, &locale);
 
   fprintf(stderr, "locale: %s, category: %d\n", locale->str, category);
diff --git a/src/modules/Gmp/mpz_glue.c b/src/modules/Gmp/mpz_glue.c
index 6a25cd4e35..fcf57d67fa 100644
--- a/src/modules/Gmp/mpz_glue.c
+++ b/src/modules/Gmp/mpz_glue.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: mpz_glue.c,v 1.80 2000/08/08 10:39:37 grubba Exp $");
+RCSID("$Id: mpz_glue.c,v 1.81 2000/08/10 09:51:52 per Exp $");
 #include "gmp_machine.h"
 
 #if defined(HAVE_GMP2_GMP_H) && defined(HAVE_LIBGMP2)
@@ -1120,7 +1120,7 @@ CMPEQU(mpzmod_nq, !=, 1)
 
 static void mpzmod_probably_prime_p(INT32 args)
 {
-  int count;
+  INT_TYPE count;
   if (args)
   {
     get_all_args("Gmp.mpz->probably_prime_p", args, "%i", &count);
@@ -1135,7 +1135,7 @@ static void mpzmod_probably_prime_p(INT32 args)
 
 static void mpzmod_small_factor(INT32 args)
 {
-  int limit;
+  INT_TYPE limit;
 
   if (args)
     {
@@ -1151,8 +1151,8 @@ static void mpzmod_small_factor(INT32 args)
 
 static void mpzmod_next_prime(INT32 args)
 {
-  INT32 count = 25;
-  INT32 limit = INT_MAX;
+  INT_TYPE count = 25;
+  INT_TYPE limit = INT_MAX;
   struct object *o;
 
   switch(args)
diff --git a/src/modules/HTTPLoop/accept_and_parse.c b/src/modules/HTTPLoop/accept_and_parse.c
index 1725ed3d72..ff8919af86 100644
--- a/src/modules/HTTPLoop/accept_and_parse.c
+++ b/src/modules/HTTPLoop/accept_and_parse.c
@@ -574,8 +574,8 @@ static void f_accept_with_http_parse(INT32 nargs)
     struct svalue accept_callback;
     struct svalue id;
   };
-  int ms, dolog;
-  int to;
+  INT_TYPE ms, dolog;
+  INT_TYPE to;
   struct object *port;
   struct svalue *fun, *cb, *program;
   struct cache *c;
@@ -654,7 +654,7 @@ static void f_cache_status(INT32 args)
 
 void f_aap_add_filesystem( INT32 args )
 {
-  int nosyms = 0;
+  INT_TYPE nosyms = 0;
   struct pike_string *basedir, *mountpoint;
   struct array *noparse;
   struct pstring **skip_extensions;
diff --git a/src/modules/HTTPLoop/requestobject.c b/src/modules/HTTPLoop/requestobject.c
index 3c8cf4e60e..2e218e957f 100644
--- a/src/modules/HTTPLoop/requestobject.c
+++ b/src/modules/HTTPLoop/requestobject.c
@@ -1,5 +1,5 @@
 /*
- * $Id: requestobject.c,v 1.11 2000/08/09 11:04:18 grubba Exp $
+ * $Id: requestobject.c,v 1.12 2000/08/10 09:51:53 per Exp $
  */
 
 #include "global.h"
@@ -1018,7 +1018,7 @@ void f_aap_reply_with_cache(INT32 args)
 {
   struct cache_entry *ce;
   struct pike_string *reply;
-  int time_to_keep, t, freed=0;
+  INT_TYPE time_to_keep, t, freed=0;
   if(!THIS->request)
     error("Reply already called.\n");
 
diff --git a/src/modules/Image/blit.c b/src/modules/Image/blit.c
index 1447a852b3..ef1c1ac3e5 100644
--- a/src/modules/Image/blit.c
+++ b/src/modules/Image/blit.c
@@ -1,10 +1,10 @@
-/* $Id: blit.c,v 1.44 2000/08/09 11:26:49 grubba Exp $ */
+/* $Id: blit.c,v 1.45 2000/08/10 09:51:53 per Exp $ */
 #include "global.h"
 
 /*
 **! module Image
 **! note
-**!	$Id: blit.c,v 1.44 2000/08/09 11:26:49 grubba Exp $
+**!	$Id: blit.c,v 1.45 2000/08/10 09:51:53 per Exp $
 **! class Image
 */
 
@@ -459,7 +459,7 @@ void image_paste_mask(INT32 args)
    struct image *img,*mask;
    INT32 x1,y1,x,y,x2,y2,smod,dmod,mmod;
    rgb_group *s,*d,*m;
-   float q;
+   double q;
 
 CHRONO("image_paste_mask init");
 
@@ -565,7 +565,7 @@ void image_paste_alpha_color(INT32 args)
    INT32 x1,y1,x,y,x2,y2;
    rgb_group rgb,*d,*m;
    INT32 mmod,dmod;
-   float q;
+   double q;
    int arg=1;
 
    if (args<1)
diff --git a/src/modules/Image/colors.c b/src/modules/Image/colors.c
index 5a34aaf4c2..d2bbef5416 100644
--- a/src/modules/Image/colors.c
+++ b/src/modules/Image/colors.c
@@ -1,7 +1,7 @@
 /*
 **! module Image
 **! note
-**!	$Id: colors.c,v 1.34 2000/08/09 17:42:13 grubba Exp $
+**!	$Id: colors.c,v 1.35 2000/08/10 09:51:53 per Exp $
 **! submodule Color
 **!
 **!	This module keeps names and easy handling 
@@ -179,7 +179,7 @@
 
 #include "global.h"
 
-RCSID("$Id: colors.c,v 1.34 2000/08/09 17:42:13 grubba Exp $");
+RCSID("$Id: colors.c,v 1.35 2000/08/10 09:51:53 per Exp $");
 
 #include "image_machine.h"
 
@@ -434,7 +434,7 @@ static void image_color_rgbf(INT32 args)
 
 static void image_color_greylevel(INT32 args)
 {
-   INT32 r,g,b;
+   INT_TYPE r,g,b;
    if (args==0)
    {
       r=87;
@@ -580,7 +580,7 @@ static void image_color_grey(INT32 args)
 static void image_color_hex(INT32 args)
 {
    char buf[80];
-   INT32 i=sizeof(COLORTYPE)*2;
+   INT_TYPE i=sizeof(COLORTYPE)*2;
 
    if (args)
       get_all_args("Image.Color.Color->hex()",args,"%i",&i);
@@ -1084,7 +1084,7 @@ static void image_color_bright(INT32 args)
 
 static void image_color_mult(INT32 args)
 {
-   float x=0.0;
+   FLOAT_TYPE x=0.0;
    get_all_args("Image.Color.Color->`*",args,"%f",&x);
    pop_n_elems(args);
    _image_make_rgb_color((int)(THIS->rgb.r*x),
@@ -1250,7 +1250,7 @@ static void image_get_color(INT32 args)
 	 if (sp[-1].type==T_ARRAY &&
 	     sp[-1].u.array->size==3)
 	 {
-	    float h,s,v;
+            FLOAT_TYPE h,s,v;
 	    stack_swap();
 	    pop_stack();
 	    sp--;
@@ -1459,7 +1459,7 @@ void _image_make_rgb_color(INT32 r,INT32 g,INT32 b)
 
 static void image_make_rgb_color(INT32 args)
 {
-   INT32 r=0,g=0,b=0;
+   INT_TYPE r=0,g=0,b=0;
 
    get_all_args("Image.Color.rgb()",args,"%i%i%i",&r,&g,&b);
 
@@ -1468,12 +1468,12 @@ static void image_make_rgb_color(INT32 args)
 
 static void image_make_hsv_color(INT32 args)
 {
-   double h,s,v;
-   double r=0,g=0,b=0; /* to avoid warning */
+   FLOAT_TYPE h,s,v;
+   FLOAT_TYPE r=0,g=0,b=0; /* to avoid warning */
 
    if (args && sp[-args].type==T_INT)
    {
-      INT32 hi,si,vi;
+      INT_TYPE hi,si,vi;
       get_all_args("Image.Color.hsv()",args,"%i%i%i",
 		   &hi,&si,&vi);
       pop_n_elems(args);
@@ -1530,7 +1530,7 @@ static void image_make_hsv_color(INT32 args)
 
 static void image_make_cmyk_color(INT32 args)
 {
-   float c,m,y,k,r,g,b;
+   FLOAT_TYPE c,m,y,k,r,g,b;
    get_all_args("Image.Color.cmyk()",args,"%F%F%F%F",&c,&m,&y,&k);
    pop_n_elems(args);
 
@@ -1543,7 +1543,7 @@ static void image_make_cmyk_color(INT32 args)
 
 static void image_make_greylevel_color(INT32 args)
 {
-   INT32 i;
+   INT_TYPE i;
 
    get_all_args("Image.Color.greylevel()",args,"%i",&i);
    pop_n_elems(args);
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index 7bb59170b8..5db00a3160 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,11 +1,11 @@
 #include "global.h"
 
-/* $Id: colortable.c,v 1.85 2000/08/09 17:13:46 grubba Exp $ */
+/* $Id: colortable.c,v 1.86 2000/08/10 09:51:53 per Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: colortable.c,v 1.85 2000/08/09 17:13:46 grubba Exp $
+**!	$Id: colortable.c,v 1.86 2000/08/10 09:51:53 per Exp $
 **! class Colortable
 **!
 **!	This object keeps colortable information,
@@ -20,7 +20,7 @@
 #undef COLORTABLE_DEBUG
 #undef COLORTABLE_REDUCE_DEBUG
 
-RCSID("$Id: colortable.c,v 1.85 2000/08/09 17:13:46 grubba Exp $");
+RCSID("$Id: colortable.c,v 1.86 2000/08/10 09:51:53 per Exp $");
 
 #include <math.h> /* fabs() */
 
@@ -2725,7 +2725,7 @@ void image_colortable_full(INT32 args)
 
 void image_colortable_rigid(INT32 args)
 {
-   int r,g,b;
+   INT_TYPE r,g,b;
 
    if (args)
    {
@@ -4055,7 +4055,7 @@ static int *ordered_make_diff(int *errors,int sz,int err)
    int *dest;
    int *d;
    int n=sz;
-   float q;
+   double q;
 
    d=dest=(int*)malloc(sizeof(int)*sz);
    if (!d) return d;
diff --git a/src/modules/Image/encodings/_xpm.c b/src/modules/Image/encodings/_xpm.c
index 32c08b194e..04f81f9ae1 100644
--- a/src/modules/Image/encodings/_xpm.c
+++ b/src/modules/Image/encodings/_xpm.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: _xpm.c,v 1.13 2000/08/03 21:25:31 grubba Exp $");
+RCSID("$Id: _xpm.c,v 1.14 2000/08/10 09:51:54 per Exp $");
 
 #include "image_machine.h"
 
@@ -227,7 +227,7 @@ void f__xpm_write_rows( INT32 args )
   struct array *colors;
   struct image *iimg, *ialpha;
   rgb_group *dst, *adst;
-  int y,x,  bpc;
+  INT_TYPE y,x,  bpc;
 
   get_all_args("_xpm_write_rows",args,"%o%o%d%a%a",
                &img,&alpha,&bpc,&colors,&pixels);
diff --git a/src/modules/Image/encodings/psd.c b/src/modules/Image/encodings/psd.c
index 300ebecfef..5bc7216bf3 100644
--- a/src/modules/Image/encodings/psd.c
+++ b/src/modules/Image/encodings/psd.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: psd.c,v 1.20 2000/08/08 11:10:24 grubba Exp $");
+RCSID("$Id: psd.c,v 1.21 2000/08/10 09:51:54 per Exp $");
 
 #include "image_machine.h"
 
@@ -381,7 +381,7 @@ static void f_decode_packbits_encoded(INT32 args)
 
 static void f_decode_image_channel( INT32 args )
 {
-  INT32 w, h, d;
+  INT_TYPE w, h, d;
   int y;
   struct pike_string *s;
   struct object *io;
@@ -415,7 +415,7 @@ static void f_decode_image_channel( INT32 args )
 
 static void f_decode_image_data( INT32 args )
 {
-  INT32 w, h, c, d, m;
+  INT_TYPE w, h, c, d, m;
   int y;
   struct pike_string *s, *ct;
   struct object *io;
diff --git a/src/modules/Image/encodings/xcf.c b/src/modules/Image/encodings/xcf.c
index a2f6b8efcf..55fb5940eb 100644
--- a/src/modules/Image/encodings/xcf.c
+++ b/src/modules/Image/encodings/xcf.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: xcf.c,v 1.18 2000/08/08 11:08:50 grubba Exp $");
+RCSID("$Id: xcf.c,v 1.19 2000/08/10 09:51:54 per Exp $");
 
 #include "image_machine.h"
 
@@ -785,7 +785,7 @@ void image_xcf_f__rle_decode( INT32 args )
   struct pike_string *t;
   struct buffer s;
   struct buffer od, d;
-  int bpp, xsize, ysize, i;
+  INT_TYPE bpp, xsize, ysize, i;
   get_all_args( "_rle_decode", args, "%S%d%d%d", &t, &bpp, &xsize, &ysize);
 
   s.len = t->len;
@@ -1098,7 +1098,7 @@ void image_xcf_f__decode_tiles( INT32 args )
   struct image *i, *a=NULL;
   struct neo_colortable *cmap = NULL;
   rgb_group *colortable=NULL;
-  int rle, bpp, span;
+  INT_TYPE rle, bpp, span;
   unsigned int l, x=0, y=0, cx, cy;
   get_all_args( "_decode_tiles", args, "%o%O%a%i%i%O",
                 &io, &ao, &tiles, &rle, &bpp, &cmapo);
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index 06dd08fe2a..3e5dd63e99 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.60 2000/07/28 07:12:44 hubbe Exp $ */
+/* $Id: font.c,v 1.61 2000/08/10 09:51:53 per Exp $ */
 #include "global.h"
 
 #define SPACE_CHAR 'i'
@@ -9,7 +9,7 @@ extern unsigned char * image_default_font;
 /*
 **! module Image
 **! note
-**!	$Id: font.c,v 1.60 2000/07/28 07:12:44 hubbe Exp $
+**!	$Id: font.c,v 1.61 2000/08/10 09:51:53 per Exp $
 **! class Font
 **!
 **! note
@@ -253,7 +253,7 @@ static void exit_font_struct(struct object *obj)
 static INLINE int char_space(struct font *this, INT32 c)
 {
   if(c==0x20)
-    return (int)((float)(this->height*this->xspacing_scale)/4.5);
+    return (int)((double)(this->height*this->xspacing_scale)/4.5);
   else if(c==0x20+128)
     return (this->height*this->xspacing_scale)/18;
   return this->charinfo[c].spacing*this->xspacing_scale;
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index a6fbe59c4e..d2f76b9842 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,9 +1,9 @@
-/* $Id: image.c,v 1.172 2000/08/09 11:07:11 grubba Exp $ */
+/* $Id: image.c,v 1.173 2000/08/10 09:51:53 per Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: image.c,v 1.172 2000/08/09 11:07:11 grubba Exp $
+**!	$Id: image.c,v 1.173 2000/08/10 09:51:53 per Exp $
 **! class Image
 **!
 **!	The main object of the <ref>Image</ref> module, this object
@@ -98,7 +98,7 @@
 
 #include "stralloc.h"
 #include "global.h"
-RCSID("$Id: image.c,v 1.172 2000/08/09 11:07:11 grubba Exp $");
+RCSID("$Id: image.c,v 1.173 2000/08/10 09:51:53 per Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -2389,11 +2389,11 @@ void image_invert(INT32 args)
 
 void image_threshold(INT32 args)
 {
-   INT32 x;
+   INT_TYPE x;
    rgb_group *s,*d,rgb;
    struct object *o;
    struct image *img;
-   int level=-1;
+   INT_TYPE level=-1;
 
    if (!THIS->img) error("Called Image.Image object is not initialized\n");;
 
diff --git a/src/modules/Image/layers.c b/src/modules/Image/layers.c
index be5c1ec61c..0b3e814a87 100644
--- a/src/modules/Image/layers.c
+++ b/src/modules/Image/layers.c
@@ -1,7 +1,7 @@
 /*
 **! module Image
 **! note
-**!	$Id: layers.c,v 1.52 2000/08/07 09:49:45 grubba Exp $
+**!	$Id: layers.c,v 1.53 2000/08/10 09:51:54 per Exp $
 **! class Layer
 **! see also: layers
 **!
@@ -215,7 +215,7 @@
 
 #include <math.h> /* floor */
 
-RCSID("$Id: layers.c,v 1.52 2000/08/07 09:49:45 grubba Exp $");
+RCSID("$Id: layers.c,v 1.53 2000/08/10 09:51:54 per Exp $");
 
 #include "image_machine.h"
 
@@ -268,10 +268,10 @@ typedef void lm_row_func(rgb_group *s,
 
 struct layer
 {
-   int xsize;            /* underlaying image size */
-   int ysize;
+   INT_TYPE xsize;            /* underlaying image size */
+   INT_TYPE ysize;
 
-   int xoffs,yoffs;      /* clip offset */
+   INT_TYPE xoffs,yoffs;      /* clip offset */
 
    struct object *image; /* image object */
    struct object *alpha; /* alpha object or null */
@@ -279,7 +279,7 @@ struct layer
    struct image *img;    /* image object storage */
    struct image *alp;    /* alpha object storage */
 
-   double alpha_value;    /* overall alpha value (1.0=opaque) */
+   FLOAT_TYPE alpha_value;    /* overall alpha value (1.0=opaque) */
 
    rgb_group fill;       /* fill color ("outside" the layer) */
    rgb_group fill_alpha; /* fill alpha */
@@ -287,11 +287,11 @@ struct layer
    rgb_group sfill[SNUMPIXS];       /* pre-calculated rows */
    rgb_group sfill_alpha[SNUMPIXS];
 
-   int tiled;            /* true if tiled */
+   INT_TYPE tiled;            /* true if tiled */
 
    lm_row_func *row_func;/* layer mode */
-   int optimize_alpha;
-   int really_optimize_alpha;
+   INT_TYPE optimize_alpha;
+   INT_TYPE really_optimize_alpha;
 
    struct mapping     *misc; /* Misc associated data. Added by per,
                                 rather useful for some things... */
@@ -856,7 +856,7 @@ static void image_layer_alpha(INT32 args)
 
 static void image_layer_set_alpha_value(INT32 args)
 {
-   float f;
+   FLOAT_TYPE f;
    get_all_args("Image.Layer->set_alpha_value",args,"%F",&f);
    if (f<0.0 || f>1.0)
       SIMPLE_BAD_ARG_ERROR("Image.Layer->set_alpha_value",1,"float(0..1)");
@@ -2559,8 +2559,7 @@ void image_lay(INT32 args)
    struct object *o;
    struct layer *dest;
    struct array *a;
-   int gotoffs;
-   int xoffset=0,yoffset=0,xsize=0,ysize=0;
+   INT_TYPE xoffset=0,yoffset=0,xsize=0,ysize=0;
 
    if (!args)
       SIMPLE_TOO_FEW_ARGS_ERROR("Image.lay",1);
@@ -2731,7 +2730,7 @@ static void image_layer_clone(INT32 args)
 static void image_layer_crop(INT32 args)
 {
    struct layer *l;
-   int x,y,xz,yz,xi,yi;
+   INT_TYPE x,y,xz,yz,xi,yi;
    int zot=0;
    struct image *img;
 
@@ -2837,8 +2836,8 @@ static void image_layer_crop(INT32 args)
 
 static void image_layer_find_autocrop(INT32 args)
 {
-   int x1=0,y1=0,x2=THIS->xsize-1,y2=THIS->ysize-1;
-   int l=1,r=1,t=1,b=1;
+   INT_TYPE x1=0,y1=0,x2=THIS->xsize-1,y2=THIS->ysize-1;
+   INT_TYPE l=1,r=1,t=1,b=1;
 
    if (args>3)
       get_all_args("find_autocrop",args,"%d%d%d%d",&l,&r,&t,&b);
diff --git a/src/modules/Math/math_matrix.c b/src/modules/Math/math_matrix.c
index 22b7e6a780..d82b5513e3 100644
--- a/src/modules/Math/math_matrix.c
+++ b/src/modules/Math/math_matrix.c
@@ -1,4 +1,4 @@
-/* $Id: math_matrix.c,v 1.15 2000/08/09 19:04:07 grubba Exp $ */
+/* $Id: math_matrix.c,v 1.16 2000/08/10 09:51:54 per Exp $ */
 
 #include "global.h"
 #include "config.h"
@@ -384,7 +384,7 @@ void matrix_vect(INT32 args)
 void matrix__sprintf(INT32 args)
 {
    FTYPE *m=THIS->m;
-   int x,y,n=0;
+   INT_TYPE x,y,n=0;
    char buf[80]; /* no %6.6g is bigger */
 
    get_all_args("_sprintf",args,"%i",&x);
diff --git a/src/modules/SANE/sane.c b/src/modules/SANE/sane.c
index ff28f56d46..9e2475ed6c 100644
--- a/src/modules/SANE/sane.c
+++ b/src/modules/SANE/sane.c
@@ -32,7 +32,7 @@
 /* must be included last */
 #include "module_magic.h"
 
-RCSID("$Id: sane.c,v 1.6 2000/07/28 07:14:53 hubbe Exp $");
+RCSID("$Id: sane.c,v 1.7 2000/08/10 09:51:54 per Exp $");
 
 /*
 **! module SANE
@@ -41,7 +41,7 @@ RCSID("$Id: sane.c,v 1.6 2000/07/28 07:14:53 hubbe Exp $");
 **!     library from pike
 **!
 **! note
-**!	$Id: sane.c,v 1.6 2000/07/28 07:14:53 hubbe Exp $
+**!	$Id: sane.c,v 1.7 2000/08/10 09:51:54 per Exp $
 */
 
 static int sane_is_inited;
@@ -257,8 +257,8 @@ static void f_scanner_set_option( INT32 args )
 {
   char *name;
   int no;
-  SANE_Int int_value;
-  float float_value;
+  INT_TYPE int_value;
+  FLOAT_TYPE float_value;
   SANE_Int tmp;
   const SANE_Option_Descriptor *d;
   get_all_args( "set_option", args, "%s", &name );
diff --git a/src/modules/_Crypto/nt.c b/src/modules/_Crypto/nt.c
index 40ecb0dc38..93ab7aa98e 100644
--- a/src/modules/_Crypto/nt.c
+++ b/src/modules/_Crypto/nt.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nt.c,v 1.5 2000/08/09 13:23:17 grubba Exp $
+ * $Id: nt.c,v 1.6 2000/08/10 09:51:55 per Exp $
  *
  * NT crypto stuff for Pike
  */
@@ -77,7 +77,7 @@ static void f_CryptGenRandom(INT32 args)
 static void f_CryptAcquireContext(INT32 args)
 {
   char *str1=NULL, *str2=NULL;
-  INT32 typ, flags, fake1, fake2;
+  INT_TYPE typ, flags, fake1, fake2;
   int nullflag=0;
   HCRYPTPROV prov;
 
diff --git a/src/modules/_Crypto/rsa.c b/src/modules/_Crypto/rsa.c
index 569e7eccf1..aca5754376 100644
--- a/src/modules/_Crypto/rsa.c
+++ b/src/modules/_Crypto/rsa.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rsa.c,v 1.22 2000/07/28 07:15:16 hubbe Exp $
+ * $Id: rsa.c,v 1.23 2000/08/10 09:51:55 per Exp $
  *
  * Glue to RSA BSAFE's RSA implementation.
  *
@@ -34,7 +34,7 @@
 /* THIS MUST BE INCLUDED LAST */
 #include "module_magic.h"
 
-RCSID("$Id: rsa.c,v 1.22 2000/07/28 07:15:16 hubbe Exp $");
+RCSID("$Id: rsa.c,v 1.23 2000/08/10 09:51:55 per Exp $");
 
 struct pike_rsa_data
 {
@@ -419,7 +419,7 @@ static void f_rsa_pad(INT32 args)
 /* string low_unpad(string block, int type) */
 static void f_low_unpad(INT32 args)
 {
-  INT32 type;
+  INT_TYPE type;
   int i = 0;
   struct pike_string *block = NULL;
   struct pike_string *res;
@@ -459,7 +459,7 @@ static void f_low_unpad(INT32 args)
 static void f_rsa_unpad(INT32 args)
 {
   struct object *block = NULL;
-  INT32 type;
+  INT_TYPE type;
   int i;
   struct pike_string *res;
 
diff --git a/src/modules/_Image_JPEG/image_jpeg.c b/src/modules/_Image_JPEG/image_jpeg.c
index 0442b4497a..40eb0ffd0b 100644
--- a/src/modules/_Image_JPEG/image_jpeg.c
+++ b/src/modules/_Image_JPEG/image_jpeg.c
@@ -1,5 +1,5 @@
 /*
- * $Id: image_jpeg.c,v 1.31 2000/08/10 07:46:36 grubba Exp $
+ * $Id: image_jpeg.c,v 1.32 2000/08/10 09:51:55 per Exp $
  */
 
 #include "global.h"
@@ -37,7 +37,7 @@
 #ifdef HAVE_STDLIB_H
 #undef HAVE_STDLIB_H
 #endif
-RCSID("$Id: image_jpeg.c,v 1.31 2000/08/10 07:46:36 grubba Exp $");
+RCSID("$Id: image_jpeg.c,v 1.32 2000/08/10 09:51:55 per Exp $");
 
 /* For some reason EXTERN can be defined here.
  * This is not good, since it confuses compilation.h.
@@ -926,7 +926,7 @@ void image_jpeg_quant_tables(INT32 args)
 
    if (args)
    {
-      int q;
+      INT_TYPE q;
       get_all_args("Image.JPEG.quant_tables",args,"%i",&q);
       jpeg_set_quality(&cinfo,q,0);
    }
diff --git a/src/modules/files/termios.c b/src/modules/files/termios.c
index 2f0f6d03d8..2b9ddd3c2e 100644
--- a/src/modules/files/termios.c
+++ b/src/modules/files/termios.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: termios.c,v 1.8 2000/07/11 19:06:26 neotron Exp $");
+RCSID("$Id: termios.c,v 1.9 2000/08/10 09:51:55 per Exp $");
 #include "file_machine.h"
 
 #if defined(HAVE_TERMIOS_H)
@@ -342,7 +342,7 @@ void file_tcflush(INT32 args)
 
 void file_tcsendbreak(INT32 args)
 {
-  int len=0;
+  INT_TYPE len=0;
 
   get_all_args("tcsendbreak", args, "%d", &len);
   pop_stack();
diff --git a/src/modules/spider/spider.c b/src/modules/spider/spider.c
index 7ca7f5daaf..2bd5c9eebc 100644
--- a/src/modules/spider/spider.c
+++ b/src/modules/spider/spider.c
@@ -43,7 +43,7 @@
 #include "threads.h"
 #include "operators.h"
 
-RCSID("$Id: spider.c,v 1.96 2000/08/09 21:22:54 grubba Exp $");
+RCSID("$Id: spider.c,v 1.97 2000/08/10 09:51:55 per Exp $");
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>
@@ -1098,11 +1098,11 @@ struct thread_args
   struct thread_args *next;
   struct object *from;
   struct object *to;
-  int to_fd, from_fd;
+  INT_TYPE to_fd, from_fd;
   struct svalue cb;
   struct svalue args;
-  int len;
-  int sent;
+  INT_TYPE len;
+  INT_TYPE sent;
   char buffer[BUFFER];
 };
 
diff --git a/src/modules/system/nt.c b/src/modules/system/nt.c
index a76d3d9a0f..b7d716fa46 100644
--- a/src/modules/system/nt.c
+++ b/src/modules/system/nt.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nt.c,v 1.20 2000/07/03 19:33:08 grubba Exp $
+ * $Id: nt.c,v 1.21 2000/08/10 09:51:55 per Exp $
  *
  * NT system calls for Pike
  *
@@ -129,7 +129,7 @@ static void do_regclosekey(HKEY key)
 
 void f_RegGetKeyNames(INT32 args)
 {
-  INT32 hkey;
+  INT_TYPE hkey;
   char *key;
   int i,ret;
   HKEY new_key;
@@ -172,7 +172,7 @@ void f_RegGetKeyNames(INT32 args)
 
 void f_RegGetValues(INT32 args)
 {
-  INT32 hkey;
+  INT_TYPE hkey;
   char *key;
   int i,ret;
   HKEY new_key;
@@ -1861,7 +1861,7 @@ static void f_GetFileAttributes(INT32 args)
 static void f_SetFileAttributes(INT32 args)
 {
   char *file;
-  INT32 attr,ret;
+  INT_TYPE attr,ret;
   DWORD tmp;
   get_all_args("SetFileAttributes",args,"%s%d",&file,&attr);
   tmp=attr;
diff --git a/src/modules/system/passwords.c b/src/modules/system/passwords.c
index 8331f4ea39..0ecd51880d 100644
--- a/src/modules/system/passwords.c
+++ b/src/modules/system/passwords.c
@@ -1,5 +1,5 @@
 /*
- * $Id: passwords.c,v 1.29 2000/08/07 18:45:36 grubba Exp $
+ * $Id: passwords.c,v 1.30 2000/08/10 09:51:55 per Exp $
  *
  * Password handling for Pike.
  *
@@ -22,7 +22,7 @@
 #include "system_machine.h"
 #include "system.h"
 
-RCSID("$Id: passwords.c,v 1.29 2000/08/07 18:45:36 grubba Exp $");
+RCSID("$Id: passwords.c,v 1.30 2000/08/10 09:51:55 per Exp $");
 
 #include "module_support.h"
 #include "interpret.h"
@@ -221,7 +221,7 @@ void push_grent(struct group *ent)
 /* array getgrgid(int gid) */
 void f_getgrgid(INT32 args)
 {
-  int gid;
+  INT_TYPE gid;
   struct group *foo;
   get_all_args("getgrgid", args, "%d", &gid);
 
@@ -283,7 +283,7 @@ void f_getpwnam(INT32 args)
 /* array getpwuid(int uid) */
 void f_getpwuid(INT32 args)
 {
-  int uid;
+  INT_TYPE uid;
   struct passwd *foo;
   
   get_all_args("getpwuid", args, "%i", &uid);
diff --git a/src/modules/system/syslog.c b/src/modules/system/syslog.c
index cc4ae7fd8b..8914204cf6 100644
--- a/src/modules/system/syslog.c
+++ b/src/modules/system/syslog.c
@@ -1,5 +1,5 @@
 /*
- * $Id: syslog.c,v 1.8 1998/09/17 21:48:09 grubba Exp $
+ * $Id: syslog.c,v 1.9 2000/08/10 09:51:55 per Exp $
  *
  * Access to syslog from Pike.
  *
@@ -17,7 +17,7 @@
 
 #ifdef HAVE_SYSLOG
 
-RCSID("$Id: syslog.c,v 1.8 1998/09/17 21:48:09 grubba Exp $");
+RCSID("$Id: syslog.c,v 1.9 2000/08/10 09:51:55 per Exp $");
 
 #include "interpret.h"
 #include "svalue.h"
@@ -106,8 +106,8 @@ RCSID("$Id: syslog.c,v 1.8 1998/09/17 21:48:09 grubba Exp $");
 void f_openlog(INT32 args)
 {
   char *ident;
-  int p_option, p_facility;
-  int option=0, facility=0;
+  INT_TYPE p_option, p_facility;
+  INT_TYPE option=0, facility=0;
 
   get_all_args("openlog", args, "%s%i%i", &ident, &p_option, &p_facility);
 
@@ -153,7 +153,7 @@ void f_openlog(INT32 args)
 void f_syslog(INT32 args)
 {
   struct pike_string *s;
-  int pri=0, i;
+  INT_TYPE pri=0, i;
   char *message;
 
   get_all_args("syslog", args, "%i%S", &i, &s);
diff --git a/src/modules/system/system.c b/src/modules/system/system.c
index ce5ed53847..5adf376022 100644
--- a/src/modules/system/system.c
+++ b/src/modules/system/system.c
@@ -1,5 +1,5 @@
 /*
- * $Id: system.c,v 1.85 2000/07/07 19:03:47 grubba Exp $
+ * $Id: system.c,v 1.86 2000/08/10 09:51:55 per Exp $
  *
  * System-call module for Pike
  *
@@ -15,7 +15,7 @@
 #include "system_machine.h"
 #include "system.h"
 
-RCSID("$Id: system.c,v 1.85 2000/07/07 19:03:47 grubba Exp $");
+RCSID("$Id: system.c,v 1.86 2000/08/10 09:51:55 per Exp $");
 #ifdef HAVE_WINSOCK_H
 #include <winsock.h>
 #endif
@@ -354,7 +354,7 @@ void f_umask(INT32 args)
   VALID_FILE_IO("umask","status");
 
   if (args) {
-    int setmask;
+    INT_TYPE setmask;
     get_all_args("umask", args, "%d", &setmask);
     oldmask = umask(setmask);
   }
@@ -371,7 +371,7 @@ void f_umask(INT32 args)
 void f_chmod(INT32 args)
 {
   char *path;
-  int mode;
+  INT_TYPE mode;
   int err;
 
   VALID_FILE_IO("chmod","chmod");
@@ -392,8 +392,8 @@ void f_chmod(INT32 args)
 void f_chown(INT32 args)
 {
   char *path;
-  int uid;
-  int gid;
+  INT_TYPE uid;
+  INT_TYPE gid;
   int err;
 
 #ifdef PIKE_SECURITY
@@ -418,7 +418,7 @@ void f_chown(INT32 args)
 void f_utime(INT32 args)
 {
   char *path;
-  INT32 atime, mtime;
+  INT_TYPE atime, mtime;
   int err;
   /*&#()&@(*#&$ NT ()*&#)(&*@$#*/
 #ifdef _UTIMBUF_DEFINED
@@ -453,7 +453,7 @@ void f_initgroups(INT32 args)
 {
   char *user;
   int err;
-  INT32 group;
+  INT_TYPE group;
 
 #ifdef PIKE_SECURITY
   if(!CHECK_SECURITY(SECURITY_BIT_SECURITY))
@@ -603,7 +603,7 @@ void f_innetgr(INT32 args)
 void f_setuid(INT32 args)
 {
   int err;
-  INT32 id;
+  INT_TYPE id;
 
 #ifdef PIKE_SECURITY
   if(!CHECK_SECURITY(SECURITY_BIT_SECURITY))
@@ -654,7 +654,7 @@ void f_setgid(INT32 args)
 /* int seteuid(int euid) */
 void f_seteuid(INT32 args)
 {
-  int id;
+  INT_TYPE id;
   int err;
 
 #ifdef PIKE_SECURITY
@@ -686,7 +686,7 @@ void f_seteuid(INT32 args)
 /* int setegid(int egid) */
 void f_setegid(INT32 args)
 {
-  int id;
+  INT_TYPE id;
   int err;
 
 #ifdef PIKE_SECURITY
@@ -748,7 +748,7 @@ void f_getpgrp(INT32 args)
 #ifdef HAVE_SETRESUID
 void f_setresuid(INT32 args)
 {
-  int ruid, euid,suid;
+  INT_TYPE ruid, euid,suid;
   int err;
 
 #ifdef PIKE_SECURITY
@@ -767,7 +767,7 @@ void f_setresuid(INT32 args)
 #ifdef HAVE_SETRESGID
 void f_setresgid(INT32 args)
 {
-  int rgid, egid,sgid;
+  INT_TYPE rgid, egid,sgid;
   int err;
 
 #ifdef PIKE_SECURITY
diff --git a/src/opcodes.c b/src/opcodes.c
index bf8da3adb2..912ffdc739 100644
--- a/src/opcodes.c
+++ b/src/opcodes.c
@@ -26,7 +26,7 @@
 #include "bignum.h"
 #include "operators.h"
 
-RCSID("$Id: opcodes.c,v 1.81 2000/08/09 14:49:50 grubba Exp $");
+RCSID("$Id: opcodes.c,v 1.82 2000/08/10 09:51:51 per Exp $");
 
 void index_no_free(struct svalue *to,struct svalue *what,struct svalue *ind)
 {
@@ -810,7 +810,7 @@ CHAROPT(							\
 extern double LDEXP(double x, int exp); /* defined in encode.c */
 #endif
 
-static INLINE float low_parse_IEEE_float(char *b, int sz)
+static INLINE FLOAT_TYPE low_parse_IEEE_float(char *b, int sz)
 {
   unsigned INT32 f, extra_f;
   int s, e;
@@ -855,11 +855,11 @@ static INLINE float low_parse_IEEE_float(char *b, int sz)
       
       /* Hmm...  No idea how to generate NaN in a portable way. */
       /* Let's turn it into a 0 for now... */
-      return (float)0.0;
+      return (FLOAT_TYPE)0.0;
     } else {
       /* +/- Infinity */
 #ifdef HUGE_VAL
-      return (float)(s? -HUGE_VAL:HUGE_VAL);
+      return (FLOAT_TYPE)(s? -HUGE_VAL:HUGE_VAL);
 #else
       /* This number is infinite enough...  :) */
       e = 1024;
@@ -871,7 +871,7 @@ static INLINE float low_parse_IEEE_float(char *b, int sz)
   r = (double)f;
   if(extra_f)
     r += ((double)extra_f)/4294967296.0;
-  return (float)(s? -LDEXP(r, e):LDEXP(r, e));
+  return (FLOAT_TYPE)(s? -LDEXP(r, e):LDEXP(r, e));
 }
 
 #endif
diff --git a/src/operators.c b/src/operators.c
index 31da15cc91..8c774383ae 100644
--- a/src/operators.c
+++ b/src/operators.c
@@ -6,7 +6,7 @@
 /**/
 #include "global.h"
 #include <math.h>
-RCSID("$Id: operators.c,v 1.96 2000/08/09 15:07:34 grubba Exp $");
+RCSID("$Id: operators.c,v 1.97 2000/08/10 09:51:51 per Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "multiset.h"
@@ -2483,7 +2483,7 @@ struct program *string_assignment_program;
 #define THIS ((struct string_assignment_storage *)(CURRENT_STORAGE))
 static void f_string_assignment_index(INT32 args)
 {
-  INT32 i;
+  INT_TYPE i;
   get_all_args("string[]",args,"%i",&i);
   if(i<0) i+=THIS->s->len;
   if(i<0)
@@ -2498,7 +2498,7 @@ static void f_string_assignment_index(INT32 args)
 
 static void f_string_assignment_assign_index(INT32 args)
 {
-  INT32 i,j;
+  INT_TYPE i,j;
   union anything *u;
   get_all_args("string[]=",args,"%i%i",&i,&j);
   if((u=get_pointer_if_this_type(THIS->lval, T_STRING)))
diff --git a/src/post_modules/GTK/build_pgtk.pike b/src/post_modules/GTK/build_pgtk.pike
index 4740ddf4a1..e7fc6ed21d 100755
--- a/src/post_modules/GTK/build_pgtk.pike
+++ b/src/post_modules/GTK/build_pgtk.pike
@@ -610,7 +610,7 @@ void do_default_sprintf( int args, int offset, int len )
       emit("/* "+oline+" */\n");
       emit_proto("void pgtk_"+progname+"_set_"+line+"(int args)\n");
       emit("{\n");
-      emit("  "+type+" to, old;\n");
+      emit("  "+(type=="int"?"INT_TYPE":"FLOAT_TYPE")+" to, old;\n");
       switch( type )
       {
        case "int":
@@ -829,14 +829,14 @@ void do_default_sprintf( int args, int offset, int len )
 	   argument_list += ", int"+(last_was_optional?"|void":"");
 	   fundef += ",mixed"+(last_was_optional?"|void":"");
 	   format_string += "%D";
-	   args += "  int arg"+na+(last_was_optional?" = 0":"")+";\n";
+	   args += "  INT_TYPE arg"+na+(last_was_optional?" = 0":"")+";\n";
 	   sargs += ", &arg"+na;
 	   break;
 	 case "intp":
 	   argument_list += ", int";
 	   fundef += ",mixed"+(last_was_optional?"|void":"");
 	   format_string += "%D";
-	   args += "  int _arg"+na+", *arg"+na+"=&_arg"+na+";\n";
+	   args += "  INT_TYPE _arg"+na+", *arg"+na+"=&_arg"+na+";\n";
 	   sargs += ", _arg"+na;
 	   break;
 	 case "?float":
@@ -845,7 +845,7 @@ void do_default_sprintf( int args, int offset, int len )
 	   argument_list += ", float"+(last_was_optional?"|void":"");
 	   fundef += ",mixed"+(last_was_optional?"|void":"");
 	   format_string += "%F";
-	   args += "  float arg"+na+(last_was_optional?" = 0.0;":"")+";\n";
+	   args += "  FLOAT_TYPE arg"+na+(last_was_optional?" = 0.0;":"")+";\n";
 	   sargs += ", &arg"+na;
 	   break;
 	 case "?string":
@@ -947,8 +947,8 @@ void do_default_sprintf( int args, int offset, int len )
       switch(rest)
       {
        case 0: srt = "object"; break;
-       case "float": srt="float"; emit("  float result;\n"); break;
-       case "int": srt="int";emit("  int result;\n"); break;
+       case "float": srt="float"; emit("  FLOAT_TYPE result;\n"); break;
+       case "int": srt="int";emit("  INT_TYPE result;\n"); break;
        case "string": srt="string"; emit("  gchar *result;\n"); break;
        default:
          emit("  void *result;  /* "+rest+" */\n");
@@ -1016,10 +1016,10 @@ void do_default_sprintf( int args, int offset, int len )
         switch(rest)
         {
          case "float":
-           emit( "  push_float( result );\n" );
+           emit( "  push_float( (FLOAT_TYPE)result );\n" );
            break;
          case "int":
-           emit( "  push_int( result );\n" );
+           emit( "  push_int( (INT_TYPE)result );\n" );
            break;
          case "void":
            emit( "  push_int( 0 );\n" );
diff --git a/src/post_modules/GTK/source/gdkatom.pre b/src/post_modules/GTK/source/gdkatom.pre
index 2a930b8dd7..aca49efee6 100644
--- a/src/post_modules/GTK/source/gdkatom.pre
+++ b/src/post_modules/GTK/source/gdkatom.pre
@@ -7,7 +7,7 @@ NAME_ARGS(atom_name, only_if_exists);
 // function directly. Use GDK.Atom[name] instead of GDK._Atom(name,0).
 {
   char *atom_name;
-  int only_if_exists;
+  INT_TYPE only_if_exists;
   pgtk_verify_setup();
   pgtk_verify_not_inited();
   get_all_args("GDK.Atom( string, int )",args,"%s%d",&atom_name,&only_if_exists);
diff --git a/src/post_modules/GTK/source/gdkbitmap.pre b/src/post_modules/GTK/source/gdkbitmap.pre
index 833cf4cece..98d69e280c 100644
--- a/src/post_modules/GTK/source/gdkbitmap.pre
+++ b/src/post_modules/GTK/source/gdkbitmap.pre
@@ -10,7 +10,7 @@ NAME_ARGS(image|xsize, void|ysize, void|xbitmapdata);
 // Create a new gdkBitmap object.
 // Argument is either an Image.image object, or {xsisze,ysize,xbitmapdata}.
 {
-  int x, y;
+  INT_TYPE x, y;
   char *d;
   pgtk_verify_setup();
   pgtk_verify_not_inited();
diff --git a/src/post_modules/GTK/source/gdkcolor.pre b/src/post_modules/GTK/source/gdkcolor.pre
index a4f7a0c088..afb32716c2 100644
--- a/src/post_modules/GTK/source/gdkcolor.pre
+++ b/src/post_modules/GTK/source/gdkcolor.pre
@@ -10,7 +10,7 @@ NAME_ARGS(r|color,g,b);
 // If color is specified, it should be an Image.Color object, and the
 // only argument.
 {
-  int r,g,b;
+  INT_TYPE r,g,b;
   GdkColormap *col = gdk_colormap_get_system();
   GdkColor *c;
   pgtk_verify_setup();
diff --git a/src/post_modules/GTK/source/gdkdragcontext.pre b/src/post_modules/GTK/source/gdkdragcontext.pre
index 8c8d2fc16b..ebf82fc42f 100644
--- a/src/post_modules/GTK/source/gdkdragcontext.pre
+++ b/src/post_modules/GTK/source/gdkdragcontext.pre
@@ -21,7 +21,7 @@ NAME_ARGS(success,del,time);
 // If del is true, the source should be deleted.
 // time is the current time.
 {
-  int a, b, t;
+  INT_TYPE a, b, t;
   get_all_args("drag_finish", args, "%d%d%d", &a, &b, &t );
   gtk_drag_finish(((GdkDragContext *)THIS->obj), a, b, t);
   RETURN_THIS();
@@ -42,7 +42,7 @@ NAME_ARGS(action);
 FUNCTION(drag_drop, "function(int:object)");
 NAME_ARGS(time);
 {
-  int t;
+  INT_TYPE t;
   get_all_args( "drop", args, "%d", &t );
   gdk_drag_drop( ((GdkDragContext *)THIS->obj), t);
   RETURN_THIS();
@@ -53,7 +53,7 @@ FUNCTION(drag_abort, "function(int:object)");
 NAME_ARGS(time);
 // Abort the drag
 {
-  int t;
+  INT_TYPE t;
   get_all_args( "abort", args, "%d", &t );
   gdk_drag_abort( ((GdkDragContext *)THIS->obj), t);
   RETURN_THIS();
@@ -62,7 +62,7 @@ NAME_ARGS(time);
 FUNCTION(drop_reply, "function(int,int:object)");
 NAME_ARGS(ok,time);
 {
-  int t, o;
+  INT_TYPE t, o;
   get_all_args( "reply", args, "%d%d", &o, &t );
   gdk_drop_reply( ((GdkDragContext *)THIS->obj), o, t);
   RETURN_THIS();
@@ -75,7 +75,7 @@ ARGS(GTK.Widget,int,int);
 // dragged around by the user during this drag.
 {
   struct object *_o;
-  int x, y;
+  INT_TYPE x, y;
   get_all_args( "drag_set_icon_window", args, "%o%d%d",
                 &_o, &x, &y);
   gtk_drag_set_icon_widget( ((GdkDragContext *)THIS->obj),
diff --git a/src/post_modules/GTK/source/gdkdrawable.pre b/src/post_modules/GTK/source/gdkdrawable.pre
index d0c9cfb5b2..3be187eef2 100644
--- a/src/post_modules/GTK/source/gdkdrawable.pre
+++ b/src/post_modules/GTK/source/gdkdrawable.pre
@@ -29,7 +29,7 @@ NAME_ARGS(gc,xdest,ydest,source,xsource,ysource,width,height);
 {
   struct object *gc, *source;
   GdkWindow *win;
-  int xd, yd, xs, ys, w, h;
+  INT_TYPE xd, yd, xs, ys, w, h;
   get_all_args("copy_area",args, "%o%d%d%o%d%d%d%d",
 	       &gc, &xd, &yd, &source, &xs, &ys, &w, &h);
 
@@ -47,7 +47,7 @@ NAME_ARGS(x,y,width,height);
 // Either clears the rectangle defined by the arguments, of if no
 // arguments are specified, the whole drawable.
 {
-  int x=0, y=0, w=0, h=0;
+  INT_TYPE x=0, y=0, w=0, h=0;
   if(args==4)
     get_all_args("clear", args, "%d%d%d%d", &x, &y, &w, &h);
 
@@ -69,7 +69,7 @@ NAME_ARGS(gc,x,y);
 // img_end
 {
   struct object *g;
-  int x, y;
+  INT_TYPE x, y;
   get_all_args("draw_point", args, "%o%d%d", &g, &x, &y);
 
   gdk_draw_point( TWIN, GC(g), x, y );
@@ -85,7 +85,7 @@ NAME_ARGS(gc,x1,y1,x2,y2);
 // img_end
 {
   struct object *g;
-  int x, y, x2, y2;
+  INT_TYPE x, y, x2, y2;
   get_all_args("draw_line", args, "%o%d%d%d%d", &g, &x, &y, &x2, &y2);
 
   gdk_draw_line( TWIN, GC(g), x, y, x2, y2 );
@@ -110,7 +110,7 @@ NAME_ARGS(gc,filledp,x1,y1,x2,y2);
 // img_end
 {
   struct object *g;
-  int f, x, y, x2, y2;
+  INT_TYPE f, x, y, x2, y2;
   get_all_args("draw_rectangle",args, "%o%d%d%d%d%d",&g, &f, &x, &y, &x2, &y2);
   gdk_draw_rectangle( TWIN, GC(g), f, x, y, x2, y2 );
   RETURN_THIS();
@@ -128,7 +128,7 @@ NAME_ARGS(gc,filledp,x1,y1,x2,y2,angle1,angle2);
 // it is truncated to 360 degrees.
 {
   struct object *g;
-  int f, x, y, x2, y2, a1, a2;
+  INT_TYPE f, x, y, x2, y2, a1, a2;
   get_all_args("draw_arc",args, "%o%d%d%d%d%d%d%d",&g, &f, &x, &y, &x2, &y2,
 	       &a1, &a2);
   gdk_draw_arc( TWIN, GC(g), f, x, y, x2, y2, a1, a2 );
@@ -143,7 +143,7 @@ NAME_ARGS(gc,font,x,y,text,forcewide);
 // using either unicode or some other 16 bit font.
 {
   struct object *g,*f;
-  int x, y, force_wide=0;
+  INT_TYPE x, y, force_wide=0;
   struct pike_string *s;
   char *swapped;
   get_all_args("draw_text",args, "%o%o%d%d%W",&g,&f,  &x, &y, &s);
@@ -166,7 +166,7 @@ NAME_ARGS(gc,pixmap,xsrc,ysrc,xdest,ydest,width,height);
 // GDK(Pixmap) at xdest,ydest in the destination drawable
 {
   struct object *g, *p;
-  int xs, ys, xd, yd, w, h;
+  INT_TYPE xs, ys, xd, yd, w, h;
   get_all_args("draw_pixmap",args,"%o%o%d%d%d%d%d%d",
 	       &g,&p,&xs,&ys,&xd,&yd,&w,&h);
   gdk_draw_pixmap(TWIN,GC(g),get_gdkobject(p,Drawable),xs,ys,xd,yd,w,h);
@@ -181,7 +181,7 @@ NAME_ARGS(gc,bitmap,xsrc,ysrc,xdest,ydest,width,height);
 // fixed in GTK 1.3
 {
   struct object *g, *p;
-  int xs, ys, xd, yd, w, h;
+  INT_TYPE xs, ys, xd, yd, w, h;
   get_all_args("draw_pixmap",args,"%o%o%d%d%d%d%d%d",
 	       &g,&p,&xs,&ys,&xd,&yd,&w,&h);
   /* Hm. gdk_draw_bitmap does not exist? Not that it matters. */
@@ -202,7 +202,7 @@ NAME_ARGS(gc,image,xsrc,ysrc,xdest,ydest,width,height);
 // GDK(Image) at xdest,ydest in the destination drawable
 {
   struct object *g, *p;
-  int xs, ys, xd, yd, w, h;
+  INT_TYPE xs, ys, xd, yd, w, h;
   get_all_args("draw_pixmap",args,"%o%o%d%d%d%d%d%d",
 	       &g,&p,&xs,&ys,&xd,&yd,&w,&h);
   gdk_draw_image(TWIN,GC(g),get_gdkobject(p,Image),xs,ys,xd,yd,w,h);
diff --git a/src/post_modules/GTK/source/gdkgc.pre b/src/post_modules/GTK/source/gdkgc.pre
index 05141ec7df..a22dfcf8ed 100644
--- a/src/post_modules/GTK/source/gdkgc.pre
+++ b/src/post_modules/GTK/source/gdkgc.pre
@@ -64,7 +64,7 @@ NAME_ARGS(x,y);
 RETURNS(GDK.GC);
 // Set the clip mask origin to the specified point.
 {
-  int x, y;
+  INT_TYPE x, y;
   get_all_args("set_clip_origin", args, "%d%d", &x, &y);
   gdk_gc_set_clip_origin((GdkGC*)THIS->obj, x, y );
   RETURN_THIS();
@@ -93,7 +93,7 @@ RETURNS(GDK.GC);
 // Set the function to the specified one. One of GDK.Xor,
 // GDK.Invert and GDK.Copy.
 {
-  int a;
+  INT_TYPE a;
   get_all_args("set_function", args, "%d", &a);
   gdk_gc_set_function( (GdkGC*)THIS->obj, a);
   RETURN_THIS();
@@ -105,7 +105,7 @@ RETURNS(GDK.GC);
 // If set, anything drawn with this GC will draw on subwindows as well
 // as the window in which the drawing is done.
 {
-  int a;
+  INT_TYPE a;
   get_all_args("set_subwindow", args, "%d", &a);
   gdk_gc_set_subwindow( (GdkGC*)THIS->obj, a );
   RETURN_THIS();
diff --git a/src/post_modules/GTK/source/gdkimage.pre b/src/post_modules/GTK/source/gdkimage.pre
index fa74d130e6..15f15ed128 100644
--- a/src/post_modules/GTK/source/gdkimage.pre
+++ b/src/post_modules/GTK/source/gdkimage.pre
@@ -89,7 +89,7 @@ NAME_ARGS(widget,xoffset,yoffset,width,height);
 {
   GdkWindow *win = NULL;
   struct object *o;
-  int x, y, w, h;
+  INT_TYPE x, y, w, h;
 
   get_all_args("grab", args, "%o%d%d%d%d", &o, &x, &y, &w, &h);
 
@@ -124,7 +124,7 @@ NAME_ARGS(image|xsize,void|ysize);
     THIS->obj = (void *)gdkimage_from_pikeimage( img, THIS->extra_int,
 						 (void *)THIS->obj );
   } else {
-    int x, y;
+    INT_TYPE x, y;
     get_all_args("gdkImage", args, "%d%d", &x, &y);
     if(THIS->obj)
       gdk_image_destroy( (void *)THIS->obj );
@@ -143,7 +143,7 @@ NAME_ARGS(x,y);
 // It is usualy not very easy to convert this value to a
 // rgb triple. See get_pnm.
 {
-  int x, y;
+  INT_TYPE x, y;
   get_all_args("get_pixel", args, "%d%d", &x, &y);
   if(!THIS->obj) error("No image.\n");
   my_pop_n_elems(args);
@@ -156,7 +156,7 @@ NAME_ARGS(x,y,pixel);
 // is a X-pixel value, which is not easily gotten from a RGB color.
 // See get_pixel and set.
 {
-  int x, y, to;
+  INT_TYPE x, y, to;
   get_all_args("set_pixel", args, "%d%d%d", &x, &y, &to);
   if(!THIS->obj) error("No image.\n");
   gdk_image_put_pixel( (void *)THIS->obj, x, y, to );
diff --git a/src/post_modules/GTK/source/gdkrectangle.pre b/src/post_modules/GTK/source/gdkrectangle.pre
index c96b3ac247..7cf77d022b 100644
--- a/src/post_modules/GTK/source/gdkrectangle.pre
+++ b/src/post_modules/GTK/source/gdkrectangle.pre
@@ -6,11 +6,16 @@ NAME_ARGS(x,y,width,height);
 // NOIMG
 {
   GdkRectangle *r;
+  INT_TYPE x, y, w, h;
   pgtk_verify_setup();
   pgtk_verify_not_inited();
   THIS->obj = (void *)(r=malloc(sizeof(GdkRectangle)));
-  get_all_args( "GDK.Rectangle", args, "%d%d%d%d", &r->x, &r->y,
-		&r->width, &r->height );
+  get_all_args( "GDK.Rectangle", args, "%d%d%d%d", &x, &y, &w, &h );
+  r->x = x;
+  r->y = y;
+  r->width = w;
+  r->height = h;
+  RETURN_THIS();
 }
 
 FUNCTION(set, "function(int,int,int,int:object)");
@@ -19,8 +24,12 @@ NAME_ARGS(x,y,width,height);
 // Set the upper left corner and the size of the rectangle.
 {
   GdkRectangle *r = (GdkRectangle *)THIS->obj;
-  get_all_args( "GDK.Rectangle->set", args, "%d%d%d%d", &r->x, &r->y,
-		&r->width, &r->height );
+  INT_TYPE x, y, w, h;
+  get_all_args( "GDK.Rectangle", args, "%d%d%d%d", &x, &y, &w, &h );
+  r->x = x;
+  r->y = y;
+  r->width = w;
+  r->height = h;
   RETURN_THIS();
 }
 
diff --git a/src/post_modules/GTK/source/gdkregion.pre b/src/post_modules/GTK/source/gdkregion.pre
index d821927815..02cdd32c23 100644
--- a/src/post_modules/GTK/source/gdkregion.pre
+++ b/src/post_modules/GTK/source/gdkregion.pre
@@ -51,7 +51,7 @@ FUNCTION(point_in, "function(int,int:int)");
 NAME_ARGS(x,y);
 // Returns true if the given point resides in the given region
 {
-  int x, y;
+  INT_TYPE x, y;
   get_all_args( "point_in", args, "%d%d", &x, &y );
   my_pop_n_elems(args);
   push_int( gdk_region_point_in( (GdkRegion *)THIS->obj, x, y ) );
@@ -81,7 +81,7 @@ NAME_ARGS(dx,dy);
 RETURNS(GDK.Region);
 // Offset(move) the region by dx,dy pixels.
 {
-  int dx, dy;
+  INT_TYPE dx, dy;
   get_all_args( "offset", args, "%d%d", &dx, &dy );
   gdk_region_offset( (GdkRegion *)THIS->obj, dx, dy );
   RETURN_THIS();
@@ -96,7 +96,7 @@ RETURNS(GDK.Region);
 // specified amount.  Positive values shrink the size of the
 // region, and negative values expand the region.
 {
-  int dx, dy;
+  INT_TYPE dx, dy;
   get_all_args( "shrink", args, "%d%d", &dx, &dy );
   gdk_region_shrink( (GdkRegion *)THIS->obj, dx, dy );
   RETURN_THIS();
diff --git a/src/post_modules/GTK/source/gdkwindow.pre b/src/post_modules/GTK/source/gdkwindow.pre
index 028c5311a6..801be1b158 100644
--- a/src/post_modules/GTK/source/gdkwindow.pre
+++ b/src/post_modules/GTK/source/gdkwindow.pre
@@ -13,7 +13,7 @@ NAME_ARGS(XWindowID|parent,void|atrributes);
   pgtk_verify_not_inited();
   if(Pike_sp[-args].type == PIKE_T_INT)
   {
-    int id;
+    INT_TYPE id;
     get_all_args( "GdkWindow", args, "%d", &id );
     THIS->obj = (void *)gdk_window_foreign_new( id );
     if( !THIS->obj )
@@ -139,7 +139,7 @@ NAME_ARGS(cursor_type);
 {
   GdkCursor *c;
   static GdkCursor *font_cursors[ 256 ];
-  int i;
+  INT_TYPE i;
 
   get_all_args("set_cursor", args, "%d", &i);
 
@@ -162,7 +162,7 @@ NAME_ARGS(source,mask,fg,bg,xhot,yhot);
 // upper left corner of the cursor image.
 {
   struct object *s, *m, *fg, *bg;
-  int xh, yh;
+  INT_TYPE xh, yh;
   get_all_args("set_bitmap_cursor", args, "%o%o%o%o%d%d",
 	       &s,&m,&fg,&bg,&xh,&yh);
   gdk_window_set_cursor(  (GdkWindow *)THIS->obj,
@@ -182,7 +182,7 @@ NAME_ARGS(mask,xoffset,yoffset);
 // the supplied bitmap.
 {
   struct object *m;
-  int x, y;
+  INT_TYPE x, y;
   get_all_args("shape_combine", args, "%o%d%d", &m, &x, &y);
   gdk_window_shape_combine_mask( (GdkWindow *)THIS->obj, get_gdkobject(m,Bitmap), x, y);
   RETURN_THIS();
@@ -275,7 +275,7 @@ NAME_ARGS(events);
 // GDK.ProximityOutMask and
 // GDK.AllEventsMask
 {
-  int a;
+  INT_TYPE a;
   get_all_args( "set_events", args, "%d", &a );
   gdk_window_set_events( (GdkWindow *)THIS->obj, a );
   RETURN_THIS();
@@ -341,7 +341,7 @@ NAME_ARGS(x,y,w,h);
 RETURNS(GDK.Window);
 // Move and resize the window in one call.
 {
-  gint x, y, w, h;
+  INT_TYPE x, y, w, h;
   get_all_args( "move_resize", args, "%d%d%d%d", &x, &y, &w, &h );
   gdk_window_move_resize( (GdkWindow *)THIS->obj, x,y,w,h );
   RETURN_THIS();
@@ -397,8 +397,8 @@ NAME_ARGS(property, offset, delete_when_done);
   GdkAtom actual_property_type;
   int actual_format_type, actual_length;
   struct object *o;
-  int offset = 0;
-  int delete_when_done = 0;
+  INT_TYPE offset = 0;
+  INT_TYPE delete_when_done = 0;
   if(args == 3)
     get_all_args( "get_property", args, "%o%d%d", &o, &offset, &delete_when_done );
   else if(args == 2)
@@ -455,7 +455,7 @@ RETURNS(GDK.Window);
 {
   struct object *o, *t;
   struct pike_string *s;
-  int m;
+  INT_TYPE m;
   get_all_args( "change_property", args, "%o%o%d%W", &o, &t, &m, &s );
 
   gdk_property_change( (GdkWindow*)THIS->obj, get_gdkatom( o ),
diff --git a/src/post_modules/GTK/source/global.pre b/src/post_modules/GTK/source/global.pre
index a97ca0fe28..aae60da765 100644
--- a/src/post_modules/GTK/source/global.pre
+++ b/src/post_modules/GTK/source/global.pre
@@ -98,7 +98,7 @@ NAME_ARGS(app_id, app_version, argv, corba_init_flags);
 {
   char **data;
   char *id, *vers;
-  int argc, flags=0;
+  INT_TYPE argc, flags=0;
   struct array *a;
   if( pigtk_is_setup )
     error( "You should only call GTK.setup_gtk() or Gnome.init() once\n");
@@ -357,7 +357,7 @@ NAME_ARGS(block);
 // Run one iteration in the mainloop. If block is true, wait for an
 // event before returning.
 {
-  int n;
+  INT_TYPE n;
   get_all_args( "gtk_main_iteration_do", args, "%d", &n );
   gtk_main_iteration_do( n );
 }
diff --git a/src/post_modules/GTK/source/gnomeapp.pre b/src/post_modules/GTK/source/gnomeapp.pre
index b61829a3cf..d150340194 100644
--- a/src/post_modules/GTK/source/gnomeapp.pre
+++ b/src/post_modules/GTK/source/gnomeapp.pre
@@ -227,7 +227,7 @@ RETURNS(Gnome.AppProgressKey);
 {
   struct signal_data * d  = malloc( sizeof(struct signal_data) );
   char *message;
-  int interval;
+  INT_TYPE interval;
   GnomeAppProgressKey k;
   struct object *res;
   get_all_args( "progress_timeout", args, "%s%d%*%*",
diff --git a/src/post_modules/GTK/source/gnomecanvas.pre b/src/post_modules/GTK/source/gnomecanvas.pre
index 6ed6748e6f..bd5edcd2bd 100644
--- a/src/post_modules/GTK/source/gnomecanvas.pre
+++ b/src/post_modules/GTK/source/gnomecanvas.pre
@@ -9,7 +9,7 @@ inherit layout;
 FUNCTION(create, "function(int|void:void)");
 NAME_ARGS(anti_alias);
 {
-  int anti;
+  INT_TYPE anti;
   pgtk_verify_gnome_setup();
   pgtk_verify_not_inited();
   if( args )
diff --git a/src/post_modules/GTK/source/gnomecanvasgroup.pre b/src/post_modules/GTK/source/gnomecanvasgroup.pre
index fb327c665d..f7e556bc6a 100644
--- a/src/post_modules/GTK/source/gnomecanvasgroup.pre
+++ b/src/post_modules/GTK/source/gnomecanvasgroup.pre
@@ -6,7 +6,7 @@ FUNCTION(create, "function(object,float,float:void)");
 NAME_ARGS(parent,x,y);
 {
   gdouble _x, _y;
-  float x, y;
+  FLOAT_TYPE x, y;
   struct object *o;
   get_all_args( "create", args, "%O%f%f", &o, &x, &y );
   pgtk_verify_gnome_setup();
diff --git a/src/post_modules/GTK/source/gnomeiconlist.pre b/src/post_modules/GTK/source/gnomeiconlist.pre
index 77ced92ba3..0ae25c8cf3 100644
--- a/src/post_modules/GTK/source/gnomeiconlist.pre
+++ b/src/post_modules/GTK/source/gnomeiconlist.pre
@@ -32,7 +32,7 @@ NAME_ARGS(icon_width,flags);
 // "text_changed" signal will be emitted when an icon's text is
 // changed.
 {
-  int a, b;
+  INT_TYPE a, b;
   get_all_args( "create", args, "%d%d", &a, &b );
   pgtk_verify_gnome_setup();
   pgtk_verify_not_inited();
@@ -128,7 +128,7 @@ NAME_ARGS(icon,data);
 // <p>
 // <b>You can only use objects as icon data right now</b>
 {
-  int row;
+  INT_TYPE row;
   struct object *obj;
   get_all_args( "set_icon_data", args, "%d%o", &row, &obj );
   add_ref(obj);
@@ -141,7 +141,7 @@ FUNCTION(get_icon_data, "function(int:object)");
 NAME_ARGS(icon);
 // Return the data associated with a icon, or 0.
 {
-  int row;
+  INT_TYPE row;
   struct object *o;
   get_all_args( "get_row_data", args, "%d", &row );
 
@@ -156,7 +156,7 @@ NAME_ARGS(data);
 // Find a icon in the list that has the given user data.  If no icon is
 // found, -1 is returned.
 {
-  int row;
+  INT_TYPE row;
   struct object *o;
   get_all_args( "find_icon_from_data", args, "%o", &o );
   row = gnome_icon_list_find_icon_from_data( GNOME_ICON_LIST( THIS->obj ), o );
diff --git a/src/post_modules/GTK/source/gtkaccelgroup.pre b/src/post_modules/GTK/source/gtkaccelgroup.pre
index f61057ac26..524411ba6b 100644
--- a/src/post_modules/GTK/source/gtkaccelgroup.pre
+++ b/src/post_modules/GTK/source/gtkaccelgroup.pre
@@ -24,10 +24,10 @@ NAME_ARGS(widget,signal,key,modifiers,flags);
 // CONST(_MASK). Flags is one or more of CONST(GTK_ACCEL)
 {
   struct object *o;
-  int k;
+  INT_TYPE k;
   char *sig;
-  int mods;
-  int flags;
+  INT_TYPE mods;
+  INT_TYPE flags;
   get_all_args("add_accel", args, "%o%s%d%d", &o, &sig, &k, &mods, &flags );
   gtk_accel_group_add((void *)THIS->obj, k, mods, flags,
                       get_gtkobject( o ), sig );
@@ -40,7 +40,7 @@ RETURNS(GTK.AccelGroup);
 // Remove all bindings for the specified key/mask in the specified object.
 {
   struct object *o;
-  int k, mods;
+  INT_TYPE k, mods;
   get_all_args("remove", args, "%o%d%d", &o, &k, &mods );
   gtk_accel_group_remove((void *)THIS->obj, k,mods, get_gtkobject( o ));
   RETURN_THIS();
diff --git a/src/post_modules/GTK/source/gtkadjustment.pre b/src/post_modules/GTK/source/gtkadjustment.pre
index 9f622b83e7..205797d1bf 100644
--- a/src/post_modules/GTK/source/gtkadjustment.pre
+++ b/src/post_modules/GTK/source/gtkadjustment.pre
@@ -29,7 +29,7 @@ NAME_ARGS(value,lower,upper,step_increment,page_increment,page_size);
 // value, lower, upper, step_increment, page_increment and page_size
 // All are floating point values. For most widgets the unit is pixels.
 {
-  float l=0.0, u=1.0, v=0.0, si=0.01, pi=0.01, ps=1.0;
+  FLOAT_TYPE l=0.0, u=1.0, v=0.0, si=0.01, pi=0.01, ps=1.0;
   pgtk_verify_setup();
   pgtk_verify_not_inited();
   if(args == 6 )
diff --git a/src/post_modules/GTK/source/gtkcalendar.pre b/src/post_modules/GTK/source/gtkcalendar.pre
index f45a217de3..cf40f9c571 100644
--- a/src/post_modules/GTK/source/gtkcalendar.pre
+++ b/src/post_modules/GTK/source/gtkcalendar.pre
@@ -111,7 +111,7 @@ ARGS(int,GDK.Color);
 NAME_ARGS(index,color);
 // Set the color to use to mark dates
 {
-  int n;
+  INT_TYPE n;
   struct object *o;
   get_all_args( "set_marked_date_color", args, "%d%o", &n, &o );
   if(!get_gdkobject(o, Color))
diff --git a/src/post_modules/GTK/source/gtkclist.pre b/src/post_modules/GTK/source/gtkclist.pre
index 0e9c534435..fd62966e42 100644
--- a/src/post_modules/GTK/source/gtkclist.pre
+++ b/src/post_modules/GTK/source/gtkclist.pre
@@ -142,7 +142,7 @@ FUNCTION(get_text, "function(int,int:string)");
 NAME_ARGS(row, column);
 // Return the text associated with a specific cell.
 {
-  int x, y;
+  INT_TYPE x, y;
   gchar *p = NULL;
   get_all_args( "get_*", args, "%d%d", &x, &y );
 
@@ -160,7 +160,7 @@ RETURNS(GTK.Clist);
 NAME_ARGS(row,column,image,mask);
 // Set the pixmap of the specified cell. The mask is optional
 {
-  int x, y;
+  INT_TYPE x, y;
   struct object *a, *b=0;
   GdkPixmap *img;
   GdkBitmap *mask = NULL;
@@ -181,7 +181,7 @@ FUNCTION(get_pixmap, "function(int,int:mapping)");
 NAME_ARGS(row, column);
 // Return the pixmap for the specified cell
 {
-  int x, y;
+  INT_TYPE x, y;
   GdkPixmap *p = NULL;
   GdkBitmap *b = NULL;
   get_all_args( "get_*", args, "%d%d", &x, &y );
@@ -214,10 +214,9 @@ NAME_ARGS(row,column,text,spacing,image,mask);
 // Set the pixmap and text of the specified cell. The mask is optional
 // The spacing is the number of pixels between the pixmap and the text.
 {
-  int x, y;
+  INT_TYPE x, y, s;
   struct object *a, *b=0;
   char *t;
-  int s;
   GdkPixmap *img;
   GdkBitmap *mask = NULL;
   if(args == 5)
@@ -238,11 +237,10 @@ NAME_ARGS(row, column);
 // Return the pixmap and text for the specified cell as a mapping:<br>
 // ([ "spacing":spacing, "text":text, "pixmap":pixmap ])
 {
-  int x, y;
+  INT_TYPE x, y, s;
   gchar *t = NULL;
   GdkPixmap *p = NULL;
   GdkBitmap *b = NULL;
-  guint8 s = 0;
   get_all_args( "get_*", args, "%d%d", &x, &y );
 
   gtk_clist_get_pixtext( GTK_CLIST( THIS->obj ), x, y, &t, &s, &p, &b );
@@ -283,7 +281,7 @@ NAME_ARGS(row,color);
 // Set the foreground color of the specified row to the specified color
 {
   struct object *a;
-  int row;
+  INT_TYPE row;
   GdkColor *c;
   get_all_args( "set_foreground", args, "%d%o", &row, &a );
   c = get_gdkobject( a, Color );
@@ -299,7 +297,7 @@ NAME_ARGS(row,color);
 // Set the background color of the specified row the the specified color
 {
   struct object *a;
-  int row;
+  INT_TYPE row;
   GdkColor *c;
   get_all_args( "set_background", args, "%d%o", &row, &a );
   c = get_gdkobject( a, Color );
@@ -369,7 +367,7 @@ NAME_ARGS(row,data);
 // <p>
 // <b>You can only use objects as row data right now</b>
 {
-  int row;
+  INT_TYPE row;
   struct object *obj;
   get_all_args( "set_row_data", args, "%d%o", &row, &obj );
  add_ref(obj);
@@ -382,7 +380,7 @@ FUNCTION(get_row_data, "function(int:object)");
 NAME_ARGS(row);
 // Return the data associated with a row, or 0.
 {
-  int row;
+  INT_TYPE row;
   struct object *o;
   get_all_args( "get_row_data", args, "%d", &row );
 
@@ -427,7 +425,7 @@ RETURNS(mapping(string:int));
 // the returned values are only valid if the x and y coordinates
 // are relative to the clist window coordinates
 {
-  int r=-1, c=-1, x, y;
+  INT_TYPE r=-1, c=-1, x, y;
   get_all_args( "get_selection_info", args, "%d%d", &x, &y );
   gtk_clist_get_selection_info( GTK_CLIST( THIS->obj ), x, y, &r, &c );
 
@@ -456,7 +454,7 @@ NAME_ARGS(row);
   GtkCListRow *clist_row;
   GtkCList *clist = GTK_CLIST( THIS->obj );
   GtkStyle *style;
-  int row;
+  INT_TYPE row;
   get_all_args("get_foreground", args, "%d", &row );
   my_pop_n_elems(args);
   if (row < 0 || row >= clist->rows)
@@ -486,7 +484,7 @@ NAME_ARGS(row);
   GtkCListRow *clist_row;
   GtkCList *clist = GTK_CLIST( THIS->obj );
   GtkStyle *style;
-  int row;
+  INT_TYPE row;
   get_all_args("get_background", args, "%d", &row );
   my_pop_n_elems(args);
   if (row < 0 || row >= clist->rows)
diff --git a/src/post_modules/GTK/source/gtkctree.pre b/src/post_modules/GTK/source/gtkctree.pre
index 677ec8db60..6e6431a86f 100644
--- a/src/post_modules/GTK/source/gtkctree.pre
+++ b/src/post_modules/GTK/source/gtkctree.pre
@@ -230,7 +230,7 @@ NAME_ARGS(node, column);
 // Returns the text of the specified node
 {
   struct object *x;
-  int y;
+  INT_TYPE y;
   gchar *p = NULL;
   get_all_args( "get_*", args, "%o%d", &x, &y );
 
@@ -250,10 +250,10 @@ NAME_ARGS(row, column);
 // ([ "pixmap":the_pixmap, "mask":the_bitmap ])
 {
   struct object *x;
-  int y;
+  INT_TYPE y;
   GdkPixmap *p = NULL;
   GdkBitmap *b = NULL;
-  get_all_args( "get_*", args, "%d%d", &x, &y );
+  get_all_args( "get_*", args, "%o%d", &x, &y );
 
   my_pop_n_elems( args );
   gtk_ctree_node_get_pixmap( GTK_CTREE( THIS->obj ),
@@ -286,12 +286,12 @@ NAME_ARGS(row, column);
 // ([ "pixmap":the_pixmap, "mask":the_bitmap, "text":the_text ])
 {
   struct object *x;
-  int y;
+  INT_TYPE y;
   gchar *t = NULL;
   GdkPixmap *p = NULL;
   GdkBitmap *b = NULL;
   guint8 s = 0;
-  get_all_args( "get_*", args, "%d%d", &x, &y );
+  get_all_args( "get_*", args, "%o%d", &x, &y );
 
   gtk_ctree_node_get_pixtext( GTK_CTREE( THIS->obj ),
                               get_pgdkobject(x,pgtk_CTreeNode_program),
diff --git a/src/post_modules/GTK/source/gtkcurve.pre b/src/post_modules/GTK/source/gtkcurve.pre
index d58cbe27d2..7ee8f21790 100644
--- a/src/post_modules/GTK/source/gtkcurve.pre
+++ b/src/post_modules/GTK/source/gtkcurve.pre
@@ -8,7 +8,7 @@ void set_range( float min_x, float max_x, float min_y, float max_y );
 FUNCTION(get_vector, "function(int:array(float))");
 NAME_ARGS(num_points);
 {
-  int num_points, q=0;
+  INT_TYPE num_points, q=0;
   gfloat *vector;
   get_all_args("get_vector", args, "%d", &num_points);
   my_pop_n_elems(args);
diff --git a/src/post_modules/GTK/source/gtkdrawingarea.pre b/src/post_modules/GTK/source/gtkdrawingarea.pre
index ae36127f5d..aa9fd0f0ed 100644
--- a/src/post_modules/GTK/source/gtkdrawingarea.pre
+++ b/src/post_modules/GTK/source/gtkdrawingarea.pre
@@ -16,12 +16,12 @@ NAME_ARGS(x,y,width,height);
 // either clears the rectangle defined by the arguments, of if no
 // arguments are specified, the whole area
 {
-  int x=0, y=0, w=0, h=0;
   if(args==4)
+  {
+    INT_TYPE x=0, y=0, w=0, h=0;
     get_all_args("clear", args, "%d%d%d%d", &x, &y, &w, &h);
-
-  if(h)
     gdk_window_clear_area(TWIN, x,y,w,h);
+  }
   else
     gdk_window_clear(TWIN);
 
@@ -39,7 +39,7 @@ NAME_ARGS(gc,x,y);
 // img_end
 {
   struct object *g;
-  int x, y;
+  INT_TYPE x, y;
   get_all_args("draw_point", args, "%o%d%d", &g, &x, &y);
 
   gdk_draw_point( TWIN, GC(g), x, y );
@@ -55,7 +55,7 @@ NAME_ARGS(gc,x1,y1,x2,y2);
 // img_end
 {
   struct object *g;
-  int x, y, x2, y2;
+  INT_TYPE x, y, x2, y2;
   get_all_args("draw_line", args, "%o%d%d%d%d", &g, &x, &y, &x2, &y2);
 
   gdk_draw_line( TWIN, GC(g), x, y, x2, y2 );
@@ -81,7 +81,7 @@ NAME_ARGS(gc,filledp,x1,y1,x2,y2);
 // img_end
 {
   struct object *g;
-  int f, x, y, x2, y2;
+  INT_TYPE f, x, y, x2, y2;
   get_all_args("draw_rectangle",args, "%o%d%d%d%d%d",&g, &f, &x, &y, &x2, &y2);
   gdk_draw_rectangle( TWIN, GC(g), f, x, y, x2, y2 );
   RETURN_THIS();
@@ -92,7 +92,7 @@ ARGS(GDK.GC,int,int,int,int,int,int,int);
 NAME_ARGS(gc,filledp,x1,y1,x2,y2,angle1,angle2);
 {
   struct object *g;
-  int f, x, y, x2, y2, a1, a2;
+  INT_TYPE f, x, y, x2, y2, a1, a2;
   get_all_args("draw_arc",args, "%o%d%d%d%d%d%d%d",&g, &f, &x, &y, &x2, &y2,
 	       &a1, &a2);
   gdk_draw_arc( TWIN, GC(g), f, x, y, x2, y2, a1, a2 );
@@ -107,7 +107,7 @@ NAME_ARGS(gc,font,x,y,text,forcewide);
 // using either unicode or some other 16 bit font.
 {
   struct object *g,*f;
-  int x, y, force_wide=0;
+  INT_TYPE x, y, force_wide=0;
   struct pike_string *s;
   char *swapped;
   get_all_args("draw_text",args, "%o%o%d%d%W",&g,&f,  &x, &y, &s);
@@ -129,7 +129,7 @@ ARGS(GDK.GC,GDK.Pixmap,int,int,int,int,int,int);
 NAME_ARGS(gc,pixmap,xsrc,ysrc,xdest,ydest,width,height);
 {
   struct object *g, *p;
-  int xs, ys, xd, yd, w, h;
+  INT_TYPE xs, ys, xd, yd, w, h;
   get_all_args("draw_pixmap",args,"%o%o%d%d%d%d%d%d",
 	       &g,&p,&xs,&ys,&xd,&yd,&w,&h);
   gdk_draw_pixmap(TWIN,GC(g),get_gdkobject(p,Drawable),xs,ys,xd,yd,w,h);
@@ -141,7 +141,7 @@ ARGS(GDK.GC,GDK.Bitmap,int,int,int,int,int,int);
 NAME_ARGS(gc,bitmap,xsrc,ysrc,xdest,ydest,width,height);
 {
   struct object *g, *p;
-  int xs, ys, xd, yd, w, h;
+  INT_TYPE xs, ys, xd, yd, w, h;
   get_all_args("draw_pixmap",args,"%o%o%d%d%d%d%d%d",
 	       &g,&p,&xs,&ys,&xd,&yd,&w,&h);
   /* Hm. gdk_draw_bitmap does not exist? Not that it matters. */
@@ -154,7 +154,7 @@ ARGS(GDK.GC,GDK.Image,int,int,int,int,int,int);
 NAME_ARGS(gc,image,xsrc,ysrc,xdest,ydest,width,height);
 {
   struct object *g, *p;
-  int xs, ys, xd, yd, w, h;
+  INT_TYPE xs, ys, xd, yd, w, h;
   get_all_args("draw_pixmap",args,"%o%o%d%d%d%d%d%d",
 	       &g,&p,&xs,&ys,&xd,&yd,&w,&h);
   gdk_draw_image(TWIN,GC(g),get_gdkobject(p,Image),xs,ys,xd,yd,w,h);
diff --git a/src/post_modules/GTK/source/gtklist.pre b/src/post_modules/GTK/source/gtklist.pre
index ab9b83147a..89e3f3555b 100644
--- a/src/post_modules/GTK/source/gtklist.pre
+++ b/src/post_modules/GTK/source/gtklist.pre
@@ -42,7 +42,7 @@ ARGS(array(GTK.ListItem),int);
 NAME_ARGS(items,position);
 {
   struct array *a;
-  int p;
+  INT_TYPE p;
   GList *items = NULL;
   int i;
   get_all_args("insert_items", args, "%a%d", &a, &p);
diff --git a/src/post_modules/GTK/source/gtkmenu.pre b/src/post_modules/GTK/source/gtkmenu.pre
index 6167209e33..551a727828 100644
--- a/src/post_modules/GTK/source/gtkmenu.pre
+++ b/src/post_modules/GTK/source/gtkmenu.pre
@@ -31,7 +31,7 @@ RETURNS(GTK.Menu);
 NAME_ARGS(button_pressed_to_show_menu);
 // The default button is 3.
 {
-  int button = 3;
+  INT_TYPE button = 3;
   if( args )
     get_all_args( "popup", args, "%d", &button );
   gtk_menu_popup(GTK_MENU(THIS->obj), NULL,NULL,NULL,NULL, button, time(0));
diff --git a/src/post_modules/GTK/source/gtkobject.pre b/src/post_modules/GTK/source/gtkobject.pre
index 7983d4ffe0..729dc3f7e7 100644
--- a/src/post_modules/GTK/source/gtkobject.pre
+++ b/src/post_modules/GTK/source/gtkobject.pre
@@ -36,7 +36,7 @@ NAME_ARGS(signal_id);
 // Remove a signal formerly added by signal_connect. The argument is
 // the return value of signal_connect(). See signal connect for more info.
 {
-  int i;
+  INT_TYPE i;
   get_all_args("signal_disconnect", args, "%d", &i);
   gtk_signal_disconnect( GTK_OBJECT( THIS->obj ), i );
 }
@@ -48,7 +48,7 @@ NAME_ARGS(signal_id);
 // while the hander is blocked.
 // See signal connect for more info.
 {
-  int i;
+  INT_TYPE i;
   get_all_args("signal_block", args, "%d", &i);
   gtk_signal_handler_block( GTK_OBJECT( THIS->obj ), i );
 }
@@ -59,7 +59,7 @@ NAME_ARGS(signal_id);
 // Unblock a formerly blocked signal handler. See signal_block and
 // signal_connect for more info.
 {
-  int i;
+  INT_TYPE i;
   get_all_args("signal_unblock", args, "%d", &i);
   gtk_signal_handler_unblock( GTK_OBJECT( THIS->obj ), i );
 }
diff --git a/src/post_modules/GTK/source/gtkwidget.pre b/src/post_modules/GTK/source/gtkwidget.pre
index 213998f05b..d69512c3ef 100644
--- a/src/post_modules/GTK/source/gtkwidget.pre
+++ b/src/post_modules/GTK/source/gtkwidget.pre
@@ -166,7 +166,7 @@ NAME_ARGS(gc,xdest,ydest,source,xsource,ysource,width,height);
 {
   struct object *gc, *source;
   GdkWindow *win;
-  int xd, yd, xs, ys, w, h;
+  INT_TYPE xd, yd, xs, ys, w, h;
   get_all_args("copy_area",args, "%o%d%d%o%d%d%d%d",
 	       &gc, &xd, &yd, &source, &xs, &ys, &w, &h);
 
@@ -208,7 +208,7 @@ NAME_ARGS(shape, xoffset,yoffset);
 // <br>NOTE: The widget must be realized before this function can be used
 {
   struct object *m;
-  int x, y;
+  INT_TYPE x, y;
   get_all_args("shape_combine", args, "%o%d%d", &m, &x, &y);
   gtk_widget_shape_combine_mask( GTK_WIDGET( THIS->obj ),
 				 get_gdkobject(m,Bitmap), x, y);
@@ -395,7 +395,7 @@ NAME_ARGS(cursor_type, fg, bg);
 {
   GdkCursor *c;
   struct object *fg = NULL, *bg = NULL;
-  int i;
+  INT_TYPE i;
 
   if(!args)
     i = -1;
@@ -444,7 +444,7 @@ NAME_ARGS(source,mask,fg,bg,xhot,yhot);
 // Both bitmaps and both colors must be non-null.
 {
   struct object *s, *m, *fg, *bg;
-  int xh, yh;
+  INT_TYPE xh, yh;
   get_all_args("set_bitmap_cursor", args, "%o%o%o%o%d%d",
 	       &s,&m,&fg,&bg,&xh,&yh);
   gdk_window_set_cursor( TWIN,
@@ -684,7 +684,7 @@ NAME_ARGS(flags,targets,actions);
 //   results:
 RETURNS(GTK.Widget);
 {
-  int i, f, j;
+  INT_TYPE i, f, j;
   struct array *a;
   GtkTargetEntry *entries = NULL;
   get_all_args( "drag_dest_set", args, "%d%a%d", &i, &a, &f );
@@ -726,7 +726,7 @@ NAME_ARGS(flags,targets,actions);
 //   results:
 RETURNS(GTK.Widget);
 {
-  int i, f, j;
+  INT_TYPE i, f, j;
   struct array *a;
   GtkTargetEntry *entries = NULL;
   get_all_args( "drag_source_set", args, "%d%a%d", &i, &a, &f );
@@ -802,7 +802,7 @@ RETURNS(GTK.Widget);
 ARGS(GDK.DragContext,int);
 NAME_ARGS(context,time);
 {
-  int t;
+  INT_TYPE t;
   struct object *_ctx;
   GdkDragContext *ctx;
   get_all_args( "drag_get_data", args, "%o%d", &_ctx, &t );
diff --git a/src/post_modules/GTK/source/support.c b/src/post_modules/GTK/source/support.c
index db1ada376e..0c5aed189e 100644
--- a/src/post_modules/GTK/source/support.c
+++ b/src/post_modules/GTK/source/support.c
@@ -136,7 +136,7 @@ GdkImage *gdkimage_from_pikeimage( struct object *img, int fast, GdkImage *i )
 {
   GdkColormap *col = gdk_colormap_get_system();
   GdkVisual *vis = gdk_visual_get_system();
-  int x, y;
+  INT_TYPE x, y;
 
   /* 1a: create the actual image... */
   TIMER_INIT("Getting extents");
diff --git a/src/program.c b/src/program.c
index f5cb77af32..0b0a42b5c3 100644
--- a/src/program.c
+++ b/src/program.c
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: program.c,v 1.253 2000/07/30 05:34:54 hubbe Exp $");
+RCSID("$Id: program.c,v 1.254 2000/08/10 09:51:52 per Exp $");
 #include "program.h"
 #include "object.h"
 #include "dynamic_buffer.h"
@@ -4015,7 +4015,7 @@ void yywarning(char *fmt, ...) ATTRIBUTE((format(printf,1,2)))
   va_end(args);
 
   if(strlen(buf)>sizeof(buf))
-    fatal("Buffer overfloat in yywarning!\n");
+    fatal("Buffer overflow in yywarning!\n");
 
   if ((error_handler && error_handler->prog) || get_master()) {
     ref_push_string(lex.current_file);
diff --git a/src/signal_handler.c b/src/signal_handler.c
index e6aea6ce58..ed02557c6e 100644
--- a/src/signal_handler.c
+++ b/src/signal_handler.c
@@ -25,7 +25,7 @@
 #include "main.h"
 #include <signal.h>
 
-RCSID("$Id: signal_handler.c,v 1.173 2000/07/28 17:16:55 hubbe Exp $");
+RCSID("$Id: signal_handler.c,v 1.174 2000/08/10 09:51:52 per Exp $");
 
 #ifdef HAVE_PASSWD_H
 # include <passwd.h>
@@ -1597,7 +1597,7 @@ static int set_priority( int pid, char *to )
 
 void f_set_priority( INT32 args )
 {
-  int pid;
+  INT_TYPE pid;
   char *plevel;
 #ifdef PIKE_SECURITY
   if(!CHECK_SECURITY(SECURITY_BIT_SECURITY))
diff --git a/src/threads.c b/src/threads.c
index a1c67b1b52..eab2105dce 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: threads.c,v 1.133 2000/07/28 17:16:55 hubbe Exp $");
+RCSID("$Id: threads.c,v 1.134 2000/08/10 09:51:52 per Exp $");
 
 PMOD_EXPORT int num_threads = 1;
 PMOD_EXPORT int threads_disabled = 0;
@@ -852,7 +852,7 @@ void f_mutex_trylock(INT32 args)
 {
   struct mutex_storage  *m;
   struct object *o;
-  int type;
+  INT_TYPE type;
   int i=0;
 
   /* No reason to release the interpreter lock here
-- 
GitLab