---

brson · brson · commit 85d2f1dbf64c · 2011-08-20T16:31:38.000-07:00
yaml --- r: 4872 b: refs/heads/master c: 6ad5b71 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dad31d11cc4180ac97525fab9c5e3e29c8a894c
+refs/heads/master: 6ad5b71ad91ae23648945733efd162935c392a41
diff --git a/trunk/src/rt/rust.h b/trunk/src/rt/rust.h
@@ -9,8 +9,12 @@
 #ifdef __i386__
 // 'cdecl' ABI only means anything on i386
 #ifdef __WIN32__
+#ifndef CDECL
 #define CDECL __cdecl
+#endif
+#ifndef FASTCALL
 #define FASTCALL __fastcall
+#endif
 #else
 #define CDECL __attribute__((cdecl))
 #define FASTCALL __attribute__((fastcall))

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 7dad31d11cc4180ac97525fab9c5e3e29c8a894c`
	`2`	`+refs/heads/master: 6ad5b71ad91ae23648945733efd162935c392a41`