aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-12 20:24:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in zerotacg/ryzomcore/issue-remove-duplicated-ignores (pull request #128)

Browse source 
removed duplicated ignores
This commit is contained in:
C?dric OCHS 2015-12-08 17:35:55 +01:00
commit a764627fa0
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/include/nel/misc/types_nl.h
View file

@ -368,6 +368,7 @@ typedef unsigned int uint; // at least 32bits (depend of processor)
inline void *aligned_malloc(size_t size, size_t alignment) { return _aligned_malloc(size, alignment); } inline void *aligned_malloc(size_t size, size_t alignment) { return _aligned_malloc(size, alignment); }
inline void aligned_free(void *ptr) { _aligned_free(ptr); } inline void aligned_free(void *ptr) { _aligned_free(ptr); }
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
#include <stdlib.h>
// under Mac OS X, malloc is already aligned for SSE and Altivec (16 bytes alignment) // under Mac OS X, malloc is already aligned for SSE and Altivec (16 bytes alignment)
inline void *aligned_malloc(size_t size, size_t alignment) { return malloc(size); } inline void *aligned_malloc(size_t size, size_t alignment) { return malloc(size); }
inline void aligned_free(void *ptr) { free(ptr); } inline void aligned_free(void *ptr) { free(ptr); }