From 519305feb888b529c005b40445d041a088a2f8fc Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 26 Aug 2014 17:47:22 +0200
Subject: 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.
---
 scd/scdaemon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scd/scdaemon.c')

diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index aa1588392..9cc4d117c 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -826,8 +826,8 @@ main (int argc, char **argv )
           close (fd);
 
           /* create the info string: <name>:<pid>:<protocol_version> */
-          if (estream_asprintf (&infostr, "SCDAEMON_INFO=%s:%lu:1",
-				socket_name, (ulong) pid) < 0)
+          if (gpgrt_asprintf (&infostr, "SCDAEMON_INFO=%s:%lu:1",
+                              socket_name, (ulong) pid) < 0)
             {
               log_error ("out of core\n");
               kill (pid, SIGTERM);
-- 
cgit v1.2.3