diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 2 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index b22241bc9..52673e5b3 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,5 +1,7 @@ 2004-12-18 Werner Koch <[email protected]> + * gpg-agent.c (main): Remove special Pth initialize. + * agent.h (map_assuan_err): Define in terms of map_assuan_err_with_source. diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 307d43d36..dfa457282 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -179,9 +179,7 @@ static void create_directories (void); static void handle_connections (int listen_fd); /* Pth wrapper function definitions. */ -#ifndef HAVE_W32_SYSTEM GCRY_THREAD_OPTION_PTH_IMPL; -#endif #endif /*USE_GNU_PTH*/ static void check_for_running_agent (void); @@ -439,16 +437,12 @@ main (int argc, char **argv ) /* Libgcrypt requires us to register the threading model first. Note that this will also do the pth_init. */ #ifdef USE_GNU_PTH -# ifdef HAVE_W32_SYSTEM - pth_init (); -# else /*!HAVE_W32_SYSTEM*/ err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (err) { log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } -# endif/*!HAVE_W32_SYSTEM*/ #endif /*USE_GNU_PTH*/ /* Check that the libraries are suitable. Do it here because |