Fix windows bustage for bug 507089. r=me.
authorNicholas Nethercote <nnethercote@mozilla.com>
Sun, 21 Mar 2010 19:58:31 -0700
changeset 40323 d64155596297a492a34e06370e1daf01d5445b7a
parent 40322 63cfe236a671574ef65949f4811cf5db9067c3cf
child 40324 5e8ebf7d4742c3b6af19fd61a4f23e1ebb26261d
push id12610
push userrsayre@mozilla.com
push dateMon, 05 Apr 2010 17:26:41 +0000
treeherdermozilla-central@1942c0b4e101 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs507089
milestone1.9.3a3pre
Fix windows bustage for bug 507089. r=me.
js/src/lirasm/lirasm.cpp
--- a/js/src/lirasm/lirasm.cpp
+++ b/js/src/lirasm/lirasm.cpp
@@ -156,17 +156,17 @@ enum ReturnType {
 
 const ArgType I32 = nanojit::ARGTYPE_LO;
 #ifdef NANOJIT_64BIT
 const ArgType I64 = nanojit::ARGTYPE_Q;
 #endif
 const ArgType F64 = nanojit::ARGTYPE_F;
 const ArgType PTR = nanojit::ARGTYPE_P;
 const ArgType WRD = nanojit::ARGTYPE_P;
-const ArgType VOID = nanojit::ARGTYPE_V;
+const ArgType VD = nanojit::ARGTYPE_V;  // "VOID" causes problems on Windows!
  
 
 enum LirTokenType {
     NAME, NUMBER, PUNCT, NEWLINE
 };
 
 struct LirToken {
     LirTokenType type;
@@ -370,17 +370,17 @@ double sinFn(double d) {
     return sin(d);
 }
 #define sin sinFn
 
 Function functions[] = {
     FN(puts,   argMask(PTR, 1, 1) | retMask(I32)),
     FN(sin,    argMask(F64, 1, 1) | retMask(F64)),
     FN(malloc, argMask(WRD, 1, 1) | retMask(PTR)),
-    FN(free,   argMask(PTR, 1, 1) | retMask(VOID))
+    FN(free,   argMask(PTR, 1, 1) | retMask(VD))
 };
 
 template<typename out, typename in> out
 lexical_cast(in arg)
 {
     stringstream tmp;
     out ret;
     if ((tmp << arg && tmp >> ret && tmp.eof()))