aboutsummaryrefslogtreecommitdiffstats
path: root/scd/scdaemon.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2004-12-18 18:53:32 +0000
committerWerner Koch <[email protected]>2004-12-18 18:53:32 +0000
commit694037f2a58df62e94b6f4da86ad2af5d2e19109 (patch)
tree857cd8e773692d5b5caa1825ef98a919ce8f0aec /scd/scdaemon.c
parentAvoid the " map_to_assuan_status called with no error source" diagnostic. (diff)
downloadgnupg-694037f2a58df62e94b6f4da86ad2af5d2e19109.tar.gz
gnupg-694037f2a58df62e94b6f4da86ad2af5d2e19109.zip
* configure.ac (AH_BOTTOM): Define EXEEXT_S.
* autogen.sh: Updated --build-w32 feature. * gpg-agent.c (main): Remove special Pth initialize. * w32-pth.c (pth_init): Reverse return values. Use TRUE and FALSE constants. (pth_kill, pth_mutex_acquire, pth_attr_set, pth_join, pth_cancel): Ditto. * scdaemon.c (main) [W32]: Remove special Pth initialize..
Diffstat (limited to 'scd/scdaemon.c')
-rw-r--r--scd/scdaemon.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 135f0973a..901644edc 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -158,10 +158,8 @@ static char socket_name[128];
#ifndef HAVE_OPENSC
#ifdef USE_GNU_PTH
-#ifndef HAVE_W32_SYSTEM
/* Pth wrapper function definitions. */
GCRY_THREAD_OPTION_PTH_IMPL;
-#endif
static void *ticker_thread (void *arg);
#endif /*USE_GNU_PTH*/
@@ -353,16 +351,12 @@ main (int argc, char **argv )
Note that this will also do the pth_init. */
#ifndef HAVE_OPENSC
#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*/
#endif /*!HAVE_OPENSC*/