diff options
| author | Werner Koch <[email protected]> | 2005-04-05 17:09:13 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-04-05 17:09:13 +0000 |
| commit | 80f4424658f055e9738dcfca1ef1a5bd27797189 (patch) | |
| tree | 77f5fe724d2ff69b5b549ffe0b836a38e97ad8cf /include/memory.h | |
| parent | * mainproc.c (proc_plaintext): Properly handle SIG+LITERAL (old-style PGP) (diff) | |
| download | gnupg-80f4424658f055e9738dcfca1ef1a5bd27797189.tar.gz gnupg-80f4424658f055e9738dcfca1ef1a5bd27797189.zip | |
Changes to make use of code taken from libassuan. This replaces the
old ad-hoc connection code to gpg-agent. We do need this for the
forthcoming diversion of card code to an already running gpg-agent
with card-support.
Diffstat (limited to '')
| -rw-r--r-- | include/memory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/memory.h b/include/memory.h index 377c2b702..4ab5cc470 100644 --- a/include/memory.h +++ b/include/memory.h @@ -1,5 +1,5 @@ /* memory.h - memory allocation - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2005 Free Software Foundation, Inc. * * This file is part of GNUPG. * @@ -93,9 +93,9 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; /* To prepare a migration to the xmalloc suite of function as used in 1.9 we define a couple of macros. */ #define xmalloc(n) m_alloc ((n)) -#define xcalloc(n,m) m_alloc_clear ((n)*(m)) +void *xcalloc (size_t n, size_t m); #define xmalloc_secure(n) m_alloc_secure (n) -#define xcalloc_secure(n) m_alloc_secure_clear ((n)*(m)) +void *xcalloc_secure (size_t n, size_t m); #define xrealloc(a,n) m_realloc ((a),(n)) #define xstrdup(a) m_strdup ((a)) #define xfree(a) m_free (a) |