diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2017-05-15 12:21:30 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2017-05-15 12:21:30 +0200 |
| commit | 3c2972f924857016bb454201c7e92f25de9105ee (patch) | |
| tree | dee91c4c200c2e97c83fd4c46588bf923f23852c /src/lib/openmj2/opj_malloc.h | |
| parent | 28d2eabca79d06378843d1e94fecfb4a5e22178d (diff) | |
Reformat: apply reformattin on .h files (#128)
Diffstat (limited to 'src/lib/openmj2/opj_malloc.h')
| -rw-r--r-- | src/lib/openmj2/opj_malloc.h | 85 |
1 files changed, 43 insertions, 42 deletions
diff --git a/src/lib/openmj2/opj_malloc.h b/src/lib/openmj2/opj_malloc.h index ffac8961..5149a657 100644 --- a/src/lib/openmj2/opj_malloc.h +++ b/src/lib/openmj2/opj_malloc.h @@ -70,64 +70,65 @@ Allocate memory aligned to a 16 byte boundary */ /* 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 +/* 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 - #elif defined(__FreeBSD__) - #define HAVE_POSIX_MEMALIGN - /* Linux x86_64 and OSX always align allocations to 16 bytes */ - #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) - #define HAVE_MEMALIGN - #include <malloc.h> - #endif +#if defined(__sun) +#define HAVE_MEMALIGN +#elif defined(__FreeBSD__) +#define HAVE_POSIX_MEMALIGN +/* Linux x86_64 and OSX always align allocations to 16 bytes */ +#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) +#define HAVE_MEMALIGN +#include <malloc.h> +#endif #endif #define opj_aligned_malloc(size) malloc(size) #define opj_aligned_free(m) free(m) #ifdef HAVE_MM_MALLOC - #undef opj_aligned_malloc - #define opj_aligned_malloc(size) _mm_malloc(size, 16) - #undef opj_aligned_free - #define opj_aligned_free(m) _mm_free(m) +#undef opj_aligned_malloc +#define opj_aligned_malloc(size) _mm_malloc(size, 16) +#undef opj_aligned_free +#define opj_aligned_free(m) _mm_free(m) #endif #ifdef HAVE_MEMALIGN - extern void* memalign(size_t, size_t); - #undef opj_aligned_malloc - #define opj_aligned_malloc(size) memalign(16, (size)) - #undef opj_aligned_free - #define opj_aligned_free(m) free(m) +extern void* memalign(size_t, size_t); +#undef opj_aligned_malloc +#define opj_aligned_malloc(size) memalign(16, (size)) +#undef opj_aligned_free +#define opj_aligned_free(m) free(m) #endif #ifdef HAVE_POSIX_MEMALIGN - #undef opj_aligned_malloc - extern int posix_memalign(void**, size_t, size_t); - - static INLINE void* __attribute__ ((malloc)) opj_aligned_malloc(size_t size){ - void* mem = NULL; - posix_memalign(&mem, 16, size); - return mem; - } - #undef opj_aligned_free - #define opj_aligned_free(m) free(m) +#undef opj_aligned_malloc +extern int posix_memalign(void**, size_t, size_t); + +static INLINE void* __attribute__((malloc)) opj_aligned_malloc(size_t size) +{ + void* mem = NULL; + posix_memalign(&mem, 16, size); + return mem; +} +#undef opj_aligned_free +#define opj_aligned_free(m) free(m) #endif #ifdef ALLOC_PERF_OPT - #undef opj_aligned_malloc - #define opj_aligned_malloc(size) opj_malloc(size) - #undef opj_aligned_free - #define opj_aligned_free(m) opj_free(m) +#undef opj_aligned_malloc +#define opj_aligned_malloc(size) opj_malloc(size) +#undef opj_aligned_free +#define opj_aligned_free(m) opj_free(m) #endif /** |