[gs-cvs] rev 7110 - trunk/gs/src

[leonardo at ghostscript.com]

Author: leonardo
Date: 2006-10-16 08:30:51 -0700 (Mon, 16 Oct 2006)
New Revision: 7110

Modified:
   trunk/gs/src/gsmalloc.c
Log:
Fix (memory management) : Restore the memory wrapper code consistency.

DETAILS :

It was broken during the ghostpcl project merging :

1. The USE_RETRY_AND_LOCKING_MEMORY_WRAPPERS code was inconsistent.
2. The !USE_RETRY_AND_LOCKING_MEMORY_WRAPPERS code caused 
   a MSVC compiler warning due to an inaccurate type cast.

EXPECTED DIFFERENCES :

None.


Modified: trunk/gs/src/gsmalloc.c
===================================================================
--- trunk/gs/src/gsmalloc.c	2006-10-16 15:08:20 UTC (rev 7109)
+++ trunk/gs/src/gsmalloc.c	2006-10-16 15:30:51 UTC (rev 7110)
@@ -526,6 +526,11 @@
 void
 gs_malloc_release(gs_memory_t *mem)
 {
-    gs_malloc_memory_t * malloc_memory_default = mem;
+#ifdef USE_RETRY_AND_LOCKING_MEMORY_WRAPPERS
+    gs_malloc_memory_t * malloc_memory_default = gs_malloc_unwrap(mem);
+#else
+    gs_malloc_memory_t * malloc_memory_default = (gs_malloc_memory_t *)mem;
+#endif
+
     gs_malloc_memory_release(malloc_memory_default);
 }