[trunk] Import opj_malloc.h from branch 1.5.x
This commit is contained in:
parent
a46dbe6941
commit
4dba9aed22
|
@ -83,8 +83,10 @@ Allocate memory aligned to a 16 byte boundry
|
||||||
#else /* Not _WIN32 */
|
#else /* Not _WIN32 */
|
||||||
#if defined(__sun)
|
#if defined(__sun)
|
||||||
#define HAVE_MEMALIGN
|
#define HAVE_MEMALIGN
|
||||||
|
#elif defined(__FreeBSD__)
|
||||||
|
#define HAVE_POSIX_MEMALIGN
|
||||||
/* Linux x86_64 and OSX always align allocations to 16 bytes */
|
/* Linux x86_64 and OSX always align allocations to 16 bytes */
|
||||||
#elif !defined(__amd64__) && !defined(__APPLE__)
|
#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)
|
||||||
#define HAVE_MEMALIGN
|
#define HAVE_MEMALIGN
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue