From 70387bd1b81456e82df8af96568143c8f60f0f20 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 18 Aug 2008 12:41:55 -0700 Subject: [PATCH] Fixed compiling on AMD64. --- js/src/nanojit/avmplus.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/js/src/nanojit/avmplus.h b/js/src/nanojit/avmplus.h index 292ff63432..64fca7d0c9 100644 --- a/js/src/nanojit/avmplus.h +++ b/js/src/nanojit/avmplus.h @@ -99,13 +99,11 @@ static __inline__ unsigned long long rdtsc(void) } #elif defined(__x86_64__) -typedef unsigned long long int unsigned long long; - -static __inline__ unsigned long long rdtsc(void) +static __inline__ uint64_t rdtsc(void) { unsigned hi, lo; __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi)); - return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 ); + return ( (uint64_t)lo)|( ((uint64_t)hi)<<32 ); } #elif defined(__powerpc__) @@ -460,8 +458,6 @@ namespace avmplus List(GC *_gc, uint32_t _capacity=kInitialCapacity) : data(NULL), len(0), capacity(0) { ensureCapacity(_capacity); - // this is only b/c of a lot API deficiency, probably would be good to support byte/short lists - AvmAssert(sizeof(T) >= sizeof(void*)); } ~List() -- 2.11.4.GIT