X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2Fbase%2Fjas_malloc.c;h=ac2e067acd4291bcaa7a2792e2da439814a4f6cc;hb=70c00c340a35d5c13b00b372d18303aa54a31380;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..ac2e067a 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.4 2005/10/21 08:14:19 jpr Exp $
  */
 
 /******************************************************************************\
@@ -90,13 +90,15 @@
 
 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; 
   // the value returned will be either a null pointer or a unique pointer.
 
   // As quick fix always over allocate so we avoid the case of the NULL pointer
+*/
   return malloc(size+1);
 #else
   return malloc(size);