From 13209d2565c0c652a253320e569dd7bfcbef0b26 Mon Sep 17 00:00:00 2001
From: Antonin Descampe <antonin@gmail.com>
Date: Wed, 16 Jan 2008 19:01:13 +0000
Subject: [PATCH] fixed opj_malloc.h for macosx (bugfix provided by janpeder,
 thanks)

---
 ChangeLog                | 3 +++
 libopenjpeg/opj_malloc.h | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 38a552ca..46a4a7b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+January 16, 2008
+* [antonin] fixed opj_malloc.h for macosx (bugfix provided by janpeder, thanks)
+
 January 11, 2008
 + [FOD] Added missing files to JavaOpenJPEG project (files from Patrick Piscaglia)
 
diff --git a/libopenjpeg/opj_malloc.h b/libopenjpeg/opj_malloc.h
index 57a51c62..1f117b6a 100644
--- a/libopenjpeg/opj_malloc.h
+++ b/libopenjpeg/opj_malloc.h
@@ -76,8 +76,10 @@ Allocate memory aligned to a 16 byte boundry
 	#if defined(__sun)
 			#define HAVE_MEMALIGN
 		#elif defined(__GNUC__)
-			#define HAVE_MEMALIGN
-			#include <malloc.h>		
+			#ifndef __APPLE__
+				#define HAVE_MEMALIGN
+				#include <malloc.h>
+			#endif
 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
 		#elif !defined(__amd64__) && !defined(__APPLE__)	
 			/* FIXME: Yes, this is a big assumption */