projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 82e335c)
swr: [rasterizer common] guard definition of __cdecl/__stdcall
authorTim Rowley <timothy.o.rowley@intel.com>
Thu, 5 May 2016 22:13:21 +0000 (16:13 -0600)
committerTim Rowley <timothy.o.rowley@intel.com>
Thu, 19 May 2016 21:26:24 +0000 (16:26 -0500)
Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
src/gallium/drivers/swr/rasterizer/common/os.h patch | blob | history

diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
index 4076812e64a2253b7048932b29ac328f7595a8d5..1d68585121960482162fc82c2caa7a23dc00ce9d 100644 (file)
--- 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