Fix defines

novusengine · Jul 30, 2024 · 813620a · 813620a
1 parent 1120584
commit 813620a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Dependencies/dxcompiler/include/WinAdapter.h b/Dependencies/dxcompiler/include/WinAdapter.h
@@ -46,9 +46,7 @@
 #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)))
 
@@ -188,7 +186,7 @@
 
 #define vsnprintf_s vsnprintf
 #define strcat_s strcat
-#define strcpy_s(dst, n, src) strncpy(dst, src, n)
+#define strncpy_s(dst, n, src) strncpy(dst, src, n)
 #define _vscwprintf vwprintf
 #define vswprintf_s vswprintf
 #define swprintf_s swprintf

diff --git a/Dependencies/dxcompiler/include/dxcapi.h b/Dependencies/dxcompiler/include/dxcapi.h
@@ -35,7 +35,7 @@
 
 #include <dlfcn.h>
 #if !WIN32
-#undef strcpy_s
+#undef strncpy_s
 #undef ARRAYSIZE
 #endif
 #include "WinAdapter.h"

diff --git a/Source/Base/Base/Platform.h b/Source/Base/Base/Platform.h
@@ -65,6 +65,10 @@ static_assert(false, "Please add PRAGMA_ENABLE_OPTIMIZATION/PRAGMA_DISABLE_OPTIM
 #endif
 
 #if !WIN32
+#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