[svn] GnuPG - r4094 - trunk/util

[svn author dshaw]

Author: dshaw
Date: 2006-04-06 19:58:13 +0200 (Thu, 06 Apr 2006)
New Revision: 4094

Modified:
   trunk/util/ChangeLog
   trunk/util/memory.c
Log:
* memory.c (realloc): Fix compile problem with --enable-m-guard.


Modified: trunk/util/ChangeLog
===================================================================
--- trunk/util/ChangeLog	2006-04-05 17:00:13 UTC (rev 4093)
+++ trunk/util/ChangeLog	2006-04-06 17:58:13 UTC (rev 4094)
@@ -1,3 +1,7 @@
+2006-04-06  David Shaw  <dshaw at jabberwocky.com>
+
+	* memory.c (realloc): Fix compile problem with --enable-m-guard.
+
 2006-03-30  David Shaw  <dshaw at jabberwocky.com>
 
 	* cert.c (main): Fix test program build warning on OSX.

Modified: trunk/util/memory.c
===================================================================
--- trunk/util/memory.c	2006-04-05 17:00:13 UTC (rev 4093)
+++ trunk/util/memory.c	2006-04-06 17:58:13 UTC (rev 4094)
@@ -1,5 +1,5 @@
 /* memory.c  -	memory allocation
- *	Copyright (C) 1998, 1999, 2001, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2001, 2005 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -509,15 +509,15 @@
         if( len >= n ) /* we don't shrink for now */
             return a;
         if( p[-1] == MAGIC_SEC_BYTE )
-            b = FNAME(alloc_secure_clear)(n FNAMEARG);
+            b = FNAMEXM(alloc_secure_clear)(n FNAMEARG);
         else
-            b = FNAME(alloc_clear)(n FNAMEARG);
+            b = FNAMEXM(alloc_clear)(n FNAMEARG);
         FNAME(check)(NULL FNAMEARG);
         memcpy(b, a, len );
-        FNAME(free)(p FNAMEARG);
+        FNAMEX(free)(p FNAMEARG);
     }
     else
-        b = FNAME(alloc)(n FNAMEARG);
+        b = FNAMEXM(alloc)(n FNAMEARG);
 #else
     if( m_is_secure(a) ) {
 	if( !(b = secmexrealloc( a, n )) )