diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
index 736d298..522ae0d 100644
--- a/src/gallium/drivers/swr/rasterizer/common/os.h
+++ b/src/gallium/drivers/swr/rasterizer/common/os.h
@@ -81,7 +81,6 @@ typedef CARD8			BOOL;
 typedef wchar_t			WCHAR;
 typedef uint16_t		UINT16;
 typedef int				INT;
-typedef int             INT32;
 typedef unsigned int	UINT;
 typedef uint32_t		UINT32;
 typedef uint64_t		UINT64;
diff --git a/src/gallium/drivers/swr/rasterizer/core/utils.h b/src/gallium/drivers/swr/rasterizer/core/utils.h
index 8a59ef2..b9dc48c 100644
--- a/src/gallium/drivers/swr/rasterizer/core/utils.h
+++ b/src/gallium/drivers/swr/rasterizer/core/utils.h
@@ -676,7 +676,7 @@ struct UnrollerL<End, End, Step> {
 INLINE
 uint32_t ComputeCRC(uint32_t crc, const void *pData, uint32_t size)
 {
-#if defined(_WIN64) || defined(__linux__) || defined(__gnu_linux__)
+#if defined(_WIN64) || defined(__x86_64__)
     uint32_t sizeInQwords = size / sizeof(uint64_t);
     uint32_t sizeRemainderBytes = size % sizeof(uint64_t);
     uint64_t* pDataWords = (uint64_t*)pData;