diff --git a/src/cpp.c b/src/cpp.c
index 6b804d952e5dd0f159edaaa604a7494555635585..accb05791224f699411b2bed4e8eb29c92711e1b 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: cpp.c,v 1.73 2000/08/10 08:52:09 grubba Exp $
+ * $Id: cpp.c,v 1.74 2000/08/10 15:02:07 grubba Exp $
  */
 #include "global.h"
 #include "stralloc.h"
@@ -986,7 +986,8 @@ static void check_constant(struct cpp *this,
   struct svalue *save_stack=sp;
   struct svalue *sv;
   PCHARP data=args[0].arg;
-  int res,dlen,len=args[0].len;
+  int res;
+  ptrdiff_t dlen,len=args[0].len;
   struct pike_string *s;
   int c;
 
diff --git a/src/preprocessor.h b/src/preprocessor.h
index 1cafa2d265c87c9f24327c5d9d356f9484d43ccd..37a929c1d7c6825488ba9eb882a00059813b29aa 100644
--- a/src/preprocessor.h
+++ b/src/preprocessor.h
@@ -1,5 +1,5 @@
 /*
- * $Id: preprocessor.h,v 1.31 2000/08/10 15:00:20 grubba Exp $
+ * $Id: preprocessor.h,v 1.32 2000/08/10 15:01:01 grubba Exp $
  *
  * Preprocessor template.
  * Based on cpp.c 1.45
@@ -1879,7 +1879,7 @@ static ptrdiff_t lower_cpp(struct cpp *this,
 	/* NOTE: Reuses undefine_ for undef_ */
       if(WGOBBLE2(undefine_) || WGOBBLE2(undef_))
 	{
-	  INT32 tmp;
+	  ptrdiff_t tmp;
 	  struct pike_string *s;
 
 	  SKIPSPACE();