diff options
| author | Werner Koch <[email protected]> | 2010-03-10 12:24:58 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-03-10 12:24:58 +0000 |
| commit | d8b1099d01ebc1d305d47ec6dcb326980ad56396 (patch) | |
| tree | cb92563d8b116872c34ad26dcdacfd02ed3da04a /kbx/kbxutil.c | |
| parent | Fix for latest libgpg-error. (diff) | |
| download | gnupg-d8b1099d01ebc1d305d47ec6dcb326980ad56396.tar.gz gnupg-d8b1099d01ebc1d305d47ec6dcb326980ad56396.zip | |
Merged jnlib into common.
Diffstat (limited to 'kbx/kbxutil.c')
| -rw-r--r-- | kbx/kbxutil.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 459281110..592f7d467 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -29,10 +29,10 @@ #include <assert.h> #define JNLIB_NEED_LOG_LOGV -#include "../jnlib/logging.h" -#include "../jnlib/argparse.h" -#include "../jnlib/stringhelp.h" -#include "../jnlib/utf8conv.h" +#include "../common/logging.h" +#include "../common/argparse.h" +#include "../common/stringhelp.h" +#include "../common/utf8conv.h" #include "i18n.h" #include "init.h" #include "keybox-defs.h" @@ -433,7 +433,7 @@ main( int argc, char **argv ) /*create_dotlock(NULL); register locking cleanup */ - /* We need to use the gcry malloc function because jnlib does use them */ + /* We need to use the gcry malloc function because jnlib uses them. */ keybox_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free); ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free ); |