Index: vm/port/src/encoder/ia32_em64t/enc_defs.h =================================================================== --- vm/port/src/encoder/ia32_em64t/enc_defs.h (revision 555203) +++ vm/port/src/encoder/ia32_em64t/enc_defs.h (working copy) @@ -57,19 +57,12 @@ #else #define REG_STACK RegName_ESP #define REG_MAX RegName_EDI - typedef long int_ptr; #define MAX_REGS 8 #endif ENCODER_NAMESPACE_START /** - * 'int_ptr' is a signed integer type which has the - * same size as a pointer on the target platform. - * Luckily, the long type serves as desired. - */ -typedef long int_ptr; -/** * A number of bytes 'eaten' by an ordinary PUSH/POP. */ #define STACK_SLOT_SIZE (sizeof(void*)) Index: vm/jitrino/src/jet/enc_ia32.cpp =================================================================== --- vm/jitrino/src/jet/enc_ia32.cpp (revision 555203) +++ vm/jitrino/src/jet/enc_ia32.cpp (working copy) @@ -834,9 +834,9 @@ EncoderBase::Operands args; args.add(devirt(op0)); #ifdef _EM64T_ - args.add(EncoderBase::Operand(OpndSize_64, (::int_ptr)op1)); + args.add(EncoderBase::Operand(OpndSize_64, (int_ptr)op1)); #else - args.add(EncoderBase::Operand(OpndSize_32, (::int_ptr)op1)); + args.add(EncoderBase::Operand(OpndSize_32, (int_ptr)op1)); #endif ip(EncoderBase::encode(ip(), Mnemonic_MOV, args)); }