Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-03-30 08:02:24 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-03-30 08:04:20 +0400
commitc16bd951cdff8d9dd4ba44e4634cb284c6f09342 (patch)
treede4f0af701a6516ac803e002038baeb7f61b13ec /intern/guardedalloc
parent0782187979b67a743fe612d7404fe5698a4a7f24 (diff)
Enable GCC pedantic warnings with strict flags,
also modify MIN/MAX macros to prevent shadowing.
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r--intern/guardedalloc/intern/mallocn_guarded_impl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c
index 7a8545de524..724e7f95845 100644
--- a/intern/guardedalloc/intern/mallocn_guarded_impl.c
+++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c
@@ -735,7 +735,7 @@ static void MEM_guarded_printmemlist_internal(int pydict)
membl->_count);
#else
print_error("%s len: " SIZET_FORMAT " %p\n",
- membl->name, SIZET_ARG(membl->len), membl + 1);
+ membl->name, SIZET_ARG(membl->len), (void *)(membl + 1));
#endif
#ifdef DEBUG_BACKTRACE
print_memhead_backtrace(membl);