drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #276 from StefanBruens/fix_memalign_linux

Browse Source 
Fix compilation on Linux - missing include, semicolon
This commit is contained in:
Ignacio 2018-02-06 16:32:27 -08:00 committed by GitHub
commit 2c276f64d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvcore/Memory.cpp
View File

@ -131,7 +131,7 @@ void * nv::aligned_malloc(size_t size, size_t alignment)
posix_memalign(&ptr, alignment, size); posix_memalign(&ptr, alignment, size);
return ptr; return ptr;
#elif NV_OS_LINUX #elif NV_OS_LINUX
return memalign(alignment, size) return memalign(alignment, size);
#else // NV_OS_ORBIS || NV_OS_IOS #else // NV_OS_ORBIS || NV_OS_IOS
// @@ IC: iOS appears to be 16 byte aligned, should we check alignment and assert if we request a higher alignment factor? // @@ IC: iOS appears to be 16 byte aligned, should we check alignment and assert if we request a higher alignment factor?
return ::malloc(size); return ::malloc(size);

4
src/nvcore/Memory.h
View File

@ -10,6 +10,10 @@
#include <string.h> // memset #include <string.h> // memset
//#include <stddef.h> // size_t //#include <stddef.h> // size_t
#if NV_OS_LINUX
#include <malloc.h> // memalign()
#endif
//#include <new> // new and delete //#include <new> // new and delete
#define TRACK_MEMORY_LEAKS 0 #define TRACK_MEMORY_LEAKS 0