From: Tim Rowley <timothy.o.rowley@intel.com>
Date: Thu, 5 May 2016 22:13:21 +0000 (-0600)
Subject: swr: [rasterizer common] guard definition of __cdecl/__stdcall
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aebbd2f7dde05437e0621aeb94de31d1227645fa;p=mesa.git

swr: [rasterizer common] guard definition of __cdecl/__stdcall

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
---

diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
index 4076812e64a..1d685851219 100644
--- a/src/gallium/drivers/swr/rasterizer/common/os.h
+++ b/src/gallium/drivers/swr/rasterizer/common/os.h
@@ -93,8 +93,12 @@ typedef unsigned int    DWORD;
 #endif
 #define DEBUGBREAK asm ("int $3")
 #if !defined(__CYGWIN__)
+#ifndef __cdecl
 #define __cdecl
+#endif
+#ifndef __stdcall
 #define __stdcall
+#endif
 #define __declspec(X)
 #endif