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 /common/util.h | |
| parent | Fix for latest libgpg-error. (diff) | |
| download | gnupg-d8b1099d01ebc1d305d47ec6dcb326980ad56396.tar.gz gnupg-d8b1099d01ebc1d305d47ec6dcb326980ad56396.zip | |
Merged jnlib into common.
Diffstat (limited to 'common/util.h')
| -rw-r--r-- | common/util.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/common/util.h b/common/util.h index 56678620b..32d4085e7 100644 --- a/common/util.h +++ b/common/util.h @@ -33,29 +33,30 @@ /* Hash function used with libksba. */ #define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write) +/* Estream replaces most uses of stdio. */ +#include "../common/estream.h" +#include "../common/estream-printf.h" + /* Get all the stuff from jnlib. */ -#include "../jnlib/logging.h" -#include "../jnlib/argparse.h" -#include "../jnlib/stringhelp.h" -#include "../jnlib/mischelp.h" -#include "../jnlib/strlist.h" -#include "../jnlib/dotlock.h" -#include "../jnlib/utf8conv.h" -#include "../jnlib/dynload.h" +#include "../common/logging.h" +#include "../common/argparse.h" +#include "../common/stringhelp.h" +#include "../common/mischelp.h" +#include "../common/strlist.h" +#include "../common/dotlock.h" +#include "../common/utf8conv.h" +#include "../common/dynload.h" #include "init.h" /* Redefine asprintf by our estream version which uses our own memory allocator.. */ -#include "estream-printf.h" #define asprintf estream_asprintf #define vasprintf estream_vasprintf -/* Due to a bug in mingw32's snprintf related to the 'l' modifier we - better use our snprintf. */ -#ifdef HAVE_W32_SYSTEM +/* Due to a bug in mingw32's snprintf related to the 'l' modifier and + for increased portability we use our snprintf on all systems. */ #define snprintf estream_snprintf -#endif /* GCC attributes. */ |