Branch: Tag:

2005-04-21

2005-04-21 15:45:06 by Martin Stjernholm <mast@lysator.liu.se>

A couple type fixes.

Rev: src/builtin_functions.c:1.477
Rev: src/encode.c:1.188

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: encode.c,v 1.187 2004/09/06 11:43:44 grubba Exp $ + || $Id: encode.c,v 1.188 2005/04/21 15:45:06 mast Exp $   */      #include "global.h"
32:   #include "opcodes.h"   #include "peep.h"    - RCSID("$Id: encode.c,v 1.187 2004/09/06 11:43:44 grubba Exp $"); + RCSID("$Id: encode.c,v 1.188 2005/04/21 15:45:06 mast Exp $");      /* #define ENCODE_DEBUG */   
2267:    bytecode = p->strings[string_no];       if (bytecode->len % 3) { -  Pike_error("Bad bytecode string length: %d (expected multiple of 3).\n", +  Pike_error("Bad bytecode string length: %"PRINTPTRDIFFT"d (expected multiple of 3).\n",    bytecode->len);    }   
4062:    if (PIKE_CONCAT(local_num_, NAME) != p->PIKE_CONCAT(num_,NAME)) { \    ref_push_program (p); \    decode_error(Pike_sp - 1, NULL, \ -  "Value mismatch for num_" TOSTR(NAME) ": %d != %d\n", \ -  PIKE_CONCAT(local_num_, NAME), \ -  p->PIKE_CONCAT(num_, NAME)); \ +  "Value mismatch for num_" TOSTR(NAME) ": %ld != %ld\n", \ +  (long) PIKE_CONCAT(local_num_, NAME), \ +  (long) p->PIKE_CONCAT(num_, NAME)); \    }   #include "program_areas.h"