diff options
Diffstat (limited to 'intern/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 3 | ||||
| -rw-r--r-- | intern/guardedalloc/MEM_sys_types.h (renamed from intern/guardedalloc/BLO_sys_types.h) | 5 | ||||
| -rw-r--r-- | intern/guardedalloc/mmap_win.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 8d8557f2d31..844622737b4 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -27,6 +27,7 @@ */ /** \file MEM_guardedalloc.h + * \ingroup MEM * * \author Copyright (C) 2001 NaN Technologies B.V. * \brief Guarded memory (de)allocation @@ -55,7 +56,7 @@ #define MEM_MALLOCN_H #include "stdio.h" /* needed for FILE* */ -#include "BLO_sys_types.h" /* needed for uintptr_t */ +#include "MEM_sys_types.h" /* needed for uintptr_t */ #ifndef WARN_UNUSED # ifdef __GNUC__ diff --git a/intern/guardedalloc/BLO_sys_types.h b/intern/guardedalloc/MEM_sys_types.h index a0a96cdeba8..ff945a8c0c1 100644 --- a/intern/guardedalloc/BLO_sys_types.h +++ b/intern/guardedalloc/MEM_sys_types.h @@ -40,11 +40,12 @@ /* // DG: original BLO_sys_types.h is in source/blender/blenkernel // but is not allowed be accessed here because of bad-level-call +// jesterKing: I've renamed this to MEM_sys_types.h, because otherwise +// doxygen would get a conflict */ -/** \file BLO_sys_types.h +/** \file MEM_sys_types.h * \ingroup MEM - * \todo solve naming issue BLO -> MEM */ #ifndef BLO_SYS_TYPES_H diff --git a/intern/guardedalloc/mmap_win.h b/intern/guardedalloc/mmap_win.h index 0ea3df67a10..7e85a79a2ac 100644 --- a/intern/guardedalloc/mmap_win.h +++ b/intern/guardedalloc/mmap_win.h @@ -50,7 +50,7 @@ #define MAP_FAILED ((void *)-1) -#include "BLO_sys_types.h" // needed for intptr_t +#include "MEM_sys_types.h" // needed for intptr_t void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset); intptr_t munmap(void *ptr, intptr_t size); |