blob: 33c3a3eb81e1b5196f775f2999fc88c26bea5634 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
$NetBSD: patch-aa,v 1.2 2012/03/24 13:25:01 drochner Exp $
--- libopenjpeg/opj_malloc.h.orig 2012-02-07 10:49:55.000000000 +0000
+++ libopenjpeg/opj_malloc.h
@@ -69,26 +69,6 @@ Allocate memory aligned to a 16 byte bou
@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
*/
/* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */
-#ifdef _WIN32
- /* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */
- #ifdef __GNUC__
- #include <mm_malloc.h>
- #define HAVE_MM_MALLOC
- #else /* MSVC, Intel C++ */
- #include <malloc.h>
- #ifdef _mm_malloc
- #define HAVE_MM_MALLOC
- #endif
- #endif
-#else /* Not _WIN32 */
- #if defined(__sun)
- #define HAVE_MEMALIGN
- /* Linux x86_64 and OSX always align allocations to 16 bytes */
- #elif !defined(__amd64__) && !defined(__APPLE__)
- #define HAVE_MEMALIGN
- #include <malloc.h>
- #endif
-#endif
#define opj_aligned_malloc(size) malloc(size)
#define opj_aligned_free(m) free(m)
|
