From 6ad5b71ad91ae23648945733efd162935c392a41 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sat, 20 Aug 2011 16:31:38 -0700
Subject: [PATCH] Conditionally define CDECL and FASTCALL on windows

These may already be defined by other includes. Hopefully puts out the windows
fire.
---
 src/rt/rust.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/rt/rust.h b/src/rt/rust.h
index 85ca72f4f66..fdf95040df8 100644
--- a/src/rt/rust.h
+++ b/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))