X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2Fbase%2Fjas_malloc.c;h=e1f99e239d614371673004693294b40f35e80975;hb=1b14200990537794a9f66d43c89b030459237edc;hp=cc8fef8c6d6672d5f1ea8c43515a5b4ab8f0e2e4;hpb=e167d27c34ff982bd32e4a7ab56699751faf2637;p=gdcm.git diff --git a/src/gdcmjasper/src/libjasper/base/jas_malloc.c b/src/gdcmjasper/src/libjasper/base/jas_malloc.c index cc8fef8c..e1f99e23 100644 --- a/src/gdcmjasper/src/libjasper/base/jas_malloc.c +++ b/src/gdcmjasper/src/libjasper/base/jas_malloc.c @@ -64,7 +64,7 @@ /* * Memory Allocator * - * $Id: jas_malloc.c,v 1.2 2005/07/05 23:05:31 malaterre Exp $ + * $Id: jas_malloc.c,v 1.3 2005/07/05 23:39:06 malaterre Exp $ */ /******************************************************************************\ @@ -90,7 +90,7 @@ void *jas_malloc(size_t size) { -#ifdef __BORLANDC__ +#ifdef NULL_ON_MALLOC_0 // Apparently jasper does not take into account POSIX: // http://www.opengroup.org/onlinepubs/007908799/xsh/malloc.html // If the size of the space requested is 0, the behaviour is implementation-dependent;