[Bf-blender-cvs] [dc679f6247b] master: Cleanup: Use C99 format string for the SIZET_FORMAT macro

Jesse Yurkovich noreply at git.blender.org
Tue Jul 13 05:47:04 CEST 2021


Commit: dc679f6247be25f06be14e51a3a1fedf50e6dbbf
Author: Jesse Yurkovich
Date:   Mon Jul 12 20:32:37 2021 -0700
Branches: master
https://developer.blender.org/rBdc679f6247be25f06be14e51a3a1fedf50e6dbbf

Cleanup: Use C99 format string for the SIZET_FORMAT macro

All platforms support the proper format string and it's already used in
various other places.

Differential Revision: https://developer.blender.org/D11460

===================================================================

M	intern/guardedalloc/intern/mallocn_intern.h

===================================================================

diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
index aa956150484..e4bd3d533a3 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -53,14 +53,8 @@ size_t malloc_usable_size(void *ptr);
 #  undef USE_MALLOC_USABLE_SIZE
 #endif
 
-/* Blame Microsoft for LLP64 and no inttypes.h, quick workaround needed: */
-#if defined(WIN64)
-#  define SIZET_FORMAT "%I64u"
-#  define SIZET_ARG(a) ((unsigned long long)(a))
-#else
-#  define SIZET_FORMAT "%lu"
-#  define SIZET_ARG(a) ((unsigned long)(a))
-#endif
+#define SIZET_FORMAT "%zu"
+#define SIZET_ARG(a) ((size_t)(a))
 
 #define SIZET_ALIGN_4(len) ((len + 3) & ~(size_t)3)



More information about the Bf-blender-cvs mailing list