diff options
| author | Werner Koch <[email protected]> | 2014-08-26 15:47:22 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-08-26 15:47:54 +0000 |
| commit | 519305feb888b529c005b40445d041a088a2f8fc (patch) | |
| tree | 74994a5b568e059982ca83a0daa8b7d96035355d /common/init.c | |
| parent | gpg: Allow for positional parameters in the passphrase prompt. (diff) | |
| download | gnupg-519305feb888b529c005b40445d041a088a2f8fc.tar.gz gnupg-519305feb888b529c005b40445d041a088a2f8fc.zip | |
Switch to the libgpg-error provided estream.
* configure.ac (NEED_GPG_ERROR_VERSION): Reguire 1.14.
(GPGRT_ENABLE_ES_MACROS): Define.
(estream_INIT): Remove.
* m4/estream.m4: Remove.
* common/estream-printf.c, common/estream-printf.h: Remove.
* common/estream.c, common/estream.h: Remove.
* common/init.c (_init_common_subsystems): Call gpgrt initialization.
Diffstat (limited to 'common/init.c')
| -rw-r--r-- | common/init.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/common/init.c b/common/init.c index 91ee912bb..1cbd709d7 100644 --- a/common/init.c +++ b/common/init.c @@ -173,7 +173,11 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp) #endif /* Initialize the Estream library. */ - es_init (); + gpgrt_init (); + gpgrt_set_alloc_func (gcry_realloc); +#ifdef USE_NPTH + gpgrt_set_syscall_clamp (npth_unprotect, npth_protect); +#endif /* Special hack for Windows CE: We extract some options from arg to setup the standard handles. */ @@ -191,7 +195,7 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp) { int i; for (i=0; i < 3; i++) - (void)_es_get_std_stream (i); + (void)_gpgrt_get_std_stream (i); } /* --version et al shall use estream as well. */ |