head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2009.03.12.22.06.58;	author rse;	state Exp;
branches;
next	1.1;
commitid	vtM3aDRtG5iScNFt;

1.1
date	2009.02.24.13.56.11;	author rse;	state Exp;
branches;
next	;
commitid	eXSbI58kJN5o0HDt;


desc
@@


1.2
log
@modifying package: openjpeg-1.3 20090224 -> 20090312
@
text
@Index: libopenjpeg/opj_malloc.h
--- libopenjpeg/opj_malloc.h.orig	2007-12-21 11:19:01 +0100
+++ libopenjpeg/opj_malloc.h	2009-03-12 23:03:18 +0100
@@@@ -75,11 +75,11 @@@@
 #else /* Not WIN32 */
 	#if defined(__sun)
 			#define HAVE_MEMALIGN
-		#elif defined(__GNUC__)
+		#elif defined(__linux__) && defined(__GNUC__)
 			#define HAVE_MEMALIGN
-			#include <malloc.h>		
+			#include <stdlib.h>		
 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
-		#elif !defined(__amd64__) && !defined(__APPLE__)	
+		#elif defined(__linux__) && !defined(__amd64__) && !defined(__APPLE__)	
 			/* FIXME: Yes, this is a big assumption */
 			#define HAVE_POSIX_MEMALIGN
 	#endif
@


1.1
log
@new package: openjpeg 1.3 (Joint Photographic Experts Group (JPEG) Image Library)
@
text
@d3 4
a6 2
+++ libopenjpeg/opj_malloc.h	2009-02-24 14:47:54 +0100
@@@@ -77,7 +77,7 @@@@
d8 2
a9 1
 		#elif defined(__GNUC__)
d14 2
a15 1
 		#elif !defined(__amd64__) && !defined(__APPLE__)	
d17 2
@