Merge.
authorAndreas Gal <gal@mozilla.com>
Thu, 10 Jul 2008 17:41:45 -0700
changeset 17593 5c3e6ebd8e7214d0b939fe4b8c16b34a373e2a1c
parent 17592 de3ae43c32ef21abde052836f609c1e72673d252 (current diff)
parent 17590 bfabace39fc3d4577e3c5d91ff078674f9ff2027 (diff)
child 17594 b9585554a05fd81e656fd6abaf704689bf2291bf
push id1452
push usershaver@mozilla.com
push dateFri, 22 Aug 2008 00:08:22 +0000
treeherdermozilla-central@d13bb0868596 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1a1pre
Merge.
--- a/js/src/nanojit/avmplus.h
+++ b/js/src/nanojit/avmplus.h
@@ -59,21 +59,24 @@
 #define AvmAssertMsg(x, y) 
 #define AvmDebugLog(x) printf x
 
 #ifdef _MSC_VER
 /*
  * Can we just take a moment to think about what it means that MSVC doesn't have stdint.h in 2008?
  * Thanks for your time.
  */
-typedef JSUint8 uint8_t;
+typedef JSUint8  uint8_t;
+typedef JSInt8   int8_t;
 typedef JSUint16 uint16_t;
+typedef JSInt16  int16_t;
 typedef JSUint32 uint32_t;
 typedef JSInt32  int32_t;
 typedef JSUint64 uint64_t;
+typedef JSInt64  int64_t;
 #else
 #include <stdint.h>
 #endif
 
 
 #if defined(__i386__)
 
 static __inline__ unsigned long long rdtsc(void)