diff options
| author | David Shaw <[email protected]> | 2006-04-06 17:58:13 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-04-06 17:58:13 +0000 |
| commit | 4af2725d3265872fb1ede6fd0bd86e4e9aa68641 (patch) | |
| tree | 698c6838794090dae4ac9655071c2faf7451b92a | |
| parent | * make-dns-cert.c: Some changes from Peter Palfrader to send errors to (diff) | |
| download | gnupg-4af2725d3265872fb1ede6fd0bd86e4e9aa68641.tar.gz gnupg-4af2725d3265872fb1ede6fd0bd86e4e9aa68641.zip | |
* memory.c (realloc): Fix compile problem with --enable-m-guard.
Diffstat (limited to '')
| -rw-r--r-- | util/ChangeLog | 4 | ||||
| -rw-r--r-- | util/memory.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 574477a6e..2b072c08b 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,7 @@ +2006-04-06 David Shaw <[email protected]> + + * memory.c (realloc): Fix compile problem with --enable-m-guard. + 2006-03-30 David Shaw <[email protected]> * cert.c (main): Fix test program build warning on OSX. diff --git a/util/memory.c b/util/memory.c index dd7fc833a..cfdb0911f 100644 --- a/util/memory.c +++ b/util/memory.c @@ -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 @@ FNAMEX(realloc)( void *a, size_t n FNAMEPRT ) 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 )) ) |