Branch: Tag:

2005-05-18

2005-05-18 12:36:54 by Martin Stjernholm <mast@lysator.liu.se>

Fixed various type errors for 64 bit architectures. (Most are in harmless
debug messages, but anyway..)

Rev: src/array.c:1.164
Rev: src/backend.cmod:1.146
Rev: src/builtin_functions.c:1.555
Rev: src/code/bytecode.h:1.11
Rev: src/encode.c:1.214
Rev: src/gc.c:1.257
Rev: src/interpret_functions.h:1.170
Rev: src/las.c:1.347
Rev: src/modules/Gmp/mpz_glue.c:1.162
Rev: src/modules/Image/encodings/xcf.c:1.49
Rev: src/modules/Parser/html.c:1.173
Rev: src/modules/files/file.c:1.321
Rev: src/modules/files/sendfile.c:1.70
Rev: src/modules/spider/xml.c:1.71
Rev: src/object.c:1.257
Rev: src/peep.c:1.99
Rev: src/pike_types.c:1.236
Rev: src/post_modules/Shuffler/a_source_system_memory.c:1.11
Rev: src/program.c:1.566
Rev: src/svalue.c:1.195
Rev: src/threads.c:1.238

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.213 2004/05/19 09:19:23 grubba Exp $ + || $Id: encode.c,v 1.214 2005/05/18 12:36:53 mast Exp $   */      #include "global.h"
32:   #include "opcodes.h"   #include "peep.h"    - RCSID("$Id: encode.c,v 1.213 2004/05/19 09:19:23 grubba Exp $"); + RCSID("$Id: encode.c,v 1.214 2005/05/18 12:36:53 mast Exp $");      /* #define ENCODE_DEBUG */   
2252:    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);    }   
3411:    * __pragma_save_parent__.    */    lex.pragmas = (old_pragmas & ~ID_SAVE_PARENT)|ID_DONT_SAVE_PARENT; -  SET_ONERROR(err2, set_lex_pragmas, old_pragmas); +  SET_ONERROR(err2, set_lex_pragmas, (ptrdiff_t) old_pragmas);       /* Start the new program. */    orig_compilation_depth = compilation_depth;
3505:    for (e=0; e<(int)local_num_relocations; e++) {    size_t reloc;    decode_number(reloc, data); -  CHECK_RELOC(reloc, local_num_program); +  CHECK_RELOC(reloc, (size_t) local_num_program);    add_to_relocations(reloc);    }   
4041:    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) ": " \ +  "%"PRINTSIZET"d != %"PRINTSIZET"d\n", \ +  (size_t) PIKE_CONCAT(local_num_, NAME), \ +  (size_t) p->PIKE_CONCAT(num_, NAME)); \    }   #include "program_areas.h"