From: jpr <jpr>
Date: Fri, 21 Oct 2005 08:14:19 +0000 (+0000)
Subject: Comment out, using C style, C++ style comments, to avoid warnings.
X-Git-Tag: OpenJPEG.Version1.2~280
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=70c00c340a35d5c13b00b372d18303aa54a31380;p=gdcm.git

Comment out, using C style, C++ style comments, to avoid warnings.
---

diff --git a/src/gdcmjasper/src/libjasper/base/jas_malloc.c b/src/gdcmjasper/src/libjasper/base/jas_malloc.c
index e1f99e23..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.3 2005/07/05 23:39:06 malaterre Exp $
+ * $Id: jas_malloc.c,v 1.4 2005/10/21 08:14:19 jpr Exp $
  */
 
 /******************************************************************************\
@@ -91,12 +91,14 @@
 void *jas_malloc(size_t size)
 {
 #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);