Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

This commit is contained in:
Latif Khalifa
2013-10-10 05:17:41 +02:00

View File

@@ -157,9 +157,9 @@ inline void* ll_aligned_realloc_16(void* ptr, size_t size, size_t old_size) // r
#else // USE_TCMALLOC
// ll_aligned_foo_16 are not needed with tcmalloc
#define ll_aligned_malloc_16 malloc
#define ll_aligned_realloc_16(a,b,c) realloc(a,b)
#define ll_aligned_free_16 free
#define ll_aligned_malloc_16 ::malloc
#define ll_aligned_realloc_16(a,b,c) ::realloc(a,b)
#define ll_aligned_free_16 ::free
#endif // USE_TCMALLOC
inline void* ll_aligned_malloc_32(size_t size) // returned hunk MUST be freed with ll_aligned_free_32().