diff --git a/Dependencies/dxcompiler/include/WinAdapter.h b/Dependencies/dxcompiler/include/WinAdapter.h index 6a9557d..878ba17 100644 --- a/Dependencies/dxcompiler/include/WinAdapter.h +++ b/Dependencies/dxcompiler/include/WinAdapter.h @@ -46,7 +46,9 @@ #define CoTaskMemAlloc malloc #define CoTaskMemFree free +#ifndef ARRAYSIZE #define ARRAYSIZE(array) (sizeof(array) / sizeof(array[0])) +#endif // ARRAYSIZE #define _countof(a) (sizeof(a) / sizeof(*(a))) diff --git a/Source/Base/Base/Platform.h b/Source/Base/Base/Platform.h index ae5d9c6..a3d06a7 100644 --- a/Source/Base/Base/Platform.h +++ b/Source/Base/Base/Platform.h @@ -68,7 +68,5 @@ static_assert(false, "Please add PRAGMA_ENABLE_OPTIMIZATION/PRAGMA_DISABLE_OPTIM #ifndef strcpy_s #define strcpy_s(dest, count) strcpy((dest), (count)) #endif // strcpy_s -#ifndef ARRAYSIZE #define ARRAYSIZE(arr) (sizeof(arr)/sizeof(arr[0])) -#endif // ARRAYSIZE #endif