diff options
| author | Werner Koch <wk@gnupg.org> | 2004-04-20 16:16:55 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2004-04-20 16:16:55 +0200 |
| commit | d70bc68c307a36d673fc911b9bea92e28cf7396f (patch) | |
| tree | c14c915405fa2fbf2f8770e816a559aa4476a108 /kbx | |
| parent | Remove the fopencookie test. We don't need the (diff) | |
| download | gnupg2-d70bc68c307a36d673fc911b9bea92e28cf7396f.tar.xz gnupg2-d70bc68c307a36d673fc911b9bea92e28cf7396f.zip | |
Include jnlib/types.h and remove our own
definitions for byte.u16 and u32.
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/ChangeLog | 5 | ||||
| -rw-r--r-- | kbx/keybox-defs.h | 17 |
2 files changed, 11 insertions, 11 deletions
diff --git a/kbx/ChangeLog b/kbx/ChangeLog index a866e04f0..d6c75025e 100644 --- a/kbx/ChangeLog +++ b/kbx/ChangeLog @@ -1,3 +1,8 @@ +2004-04-20 Werner Koch <wk@gnupg.org> + + * keybox-defs.h: Include jnlib/types.h and remove our own + definitions for byte.u16 and u32. + 2004-02-02 Werner Koch <wk@gnupg.org> * keybox.h (keybox_flag_t): New. diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h index 17431502f..d7e132d6b 100644 --- a/kbx/keybox-defs.h +++ b/kbx/keybox-defs.h @@ -1,5 +1,5 @@ /* keybox-defs.h - interal Keybox defintions - * Copyright (C) 2001 Free Software Foundation, Inc. + * Copyright (C) 2001, 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -28,19 +28,14 @@ #include <gpg-error.h> #include <sys/types.h> /* off_t */ -#include "keybox.h" +/* We include the type defintions from jnlib instead of defining our + owns here. This will not allow us build KBX in a standalone way + but tehre is currently no need for it anyway. */ +#include "../jnlib/types.h" +#include "keybox.h" -#ifndef HAVE_BYTE_TYPEDEF -typedef unsigned char byte; /* fixme */ -#endif -#ifndef HAVE_U16_TYPEDEF -typedef unsigned short u16; /* fixme */ -#endif -#ifndef HAVE_U32_TYPEDEF -typedef unsigned int u32; /* fixme */ -#endif enum { BLOBTYPE_EMPTY = 0, |