Merge pull request #687 from stweil/memalign

Fix fatal crash on 64 bit Linux
2016-01-06 23:15:05 +01:00 · 2016-01-06 23:15:05 +01:00 · 0dd44e7dba
parent a205f70328 9cad6bc1f6
commit 0dd44e7dba
1 changed files with 9 additions and 5 deletions
--- a/src/lib/openjp2/opj_malloc.c
+++ b/src/lib/openjp2/opj_malloc.c
@ -32,6 +32,10 @@
 #define OPJ_SKIP_POISON
 #include "opj_includes.h"

+#if defined(OPJ_HAVE_MALLOC_H) && defined(OPJ_HAVE_MEMALIGN)
+# include <malloc.h>
+#endif
+
 #ifndef SIZE_MAX
 # define SIZE_MAX ((size_t) -1)
 #endif