jfmcarreira/calyp
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
jfmcarreira committed 2015-11-15 03:21:58 +00:00
2 parents 1374102a60 e396532eee
commit 8945201876
1 file changed
+3 -4
Download Patch File Download Diff File Expand all files Collapse all files
lib/LibMemory.h
+3 -4
View File
@@ -53,13 +53,12 @@ typedef unsigned long long UInt64;
#define DATA_ALIGN 1 ///< use 32-bit aligned malloc/free
#if DATA_ALIGN && _WIN32 && ( _MSC_VER > 1300 )
#define xMalloc( len ) _aligned_malloc( len, 32 )
#define xFree( ptr ) _aligned_free ( ptr )
#define xMemSet( type, len, ptr )
#define xFreeMem( ptr ) _aligned_free ( ptr )
#else
#define xMemSet( type, len, ptr ) memset ( ptr, 0, (len)*sizeof(type) )
#define xMalloc( len ) malloc ( len )
#define xFreeMem( ptr ) free ( ptr )
#define xFreeMem( ptr ) free ( ptr )
#endif
#define xMemSet( type, len, ptr ) memset ( ptr, 0, (len)*sizeof(type) )
static inline Void* xMallocMem( SizeT nitems )
{