First steps towards supporting W32.

This is mainly source code reorganization.
Update gnulib.
g10/ does currently not build.

5 files changed, 16 insertions, 18 deletions

diff --git a/scd/ChangeLog b/scd/ChangeLog
index c0141c74a..2e9024e20 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-06  Werner Koch  <[email protected]>
+
+	* app-openpgp.c (do_sign): Fix arithmetic on void*.
+
+	* app.c (dump_mutex_state) [W32]: Handle the W32Pth case.
+
+	* apdu.c: Remove dynload.h.
+
+	* scdaemon.c (i18n_init): Remove.
+
 2007-04-20  Werner Koch  <[email protected]>
 
 	* sc-copykeys.c (my_gcry_logger): Removed.
diff --git a/scd/apdu.c b/scd/apdu.c
index a45f0a3e9..57faa7006 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -62,7 +62,6 @@
 #endif /* GNUPG_MAJOR_VERSION != 1 */
 
 #include "apdu.h"
-#include "dynload.h"
 #include "ccid-driver.h"
 
 
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index a02ff0396..2b7263171 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2223,13 +2223,13 @@ do_sign (app_t app, const char *keyidstr, int hashalgo,
   else if (indatalen == (15 + 20) && hashalgo == GCRY_MD_SHA1
            && !memcmp (indata, sha1_prefix, 15))
     {
-      indata += 15;
+      indata = (const char*)indata + 15;
       indatalen -= 15;
     }
   else if (indatalen == (15 + 20) && hashalgo == GCRY_MD_RMD160
            && !memcmp (indata, rmd160_prefix, 15))
     {
-      indata += 15;
+      indata = (const char*)indata + 15;
       indatalen -= 15;
     }
   else
diff --git a/scd/app.c b/scd/app.c
index eb07d48b9..e9cbcbb6f 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -107,12 +107,16 @@ unlock_reader (int slot)
 static void
 dump_mutex_state (pth_mutex_t *m)
 {
+#ifdef _W32_PTH_H
+  log_printf ("unknown under W32");
+#else
   if (!(m->mx_state & PTH_MUTEX_INITIALIZED))
     log_printf ("not_initialized");
   else if (!(m->mx_state & PTH_MUTEX_LOCKED))
     log_printf ("not_locked");
   else
     log_printf ("locked tid=0x%lx count=%lu", (long)m->mx_owner, m->mx_count);
+#endif
 }
 
 
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index b87c0f3e5..ea97a392c 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -205,21 +205,6 @@ my_strusage (int level)
 
 
 
-static void
-i18n_init (void)
-{
-#ifdef USE_SIMPLE_GETTEXT
-    set_gettext_file( PACKAGE_GT );
-#else
-#ifdef ENABLE_NLS
-    setlocale (LC_ALL, "");
-    bindtextdomain (PACKAGE_GT, LOCALEDIR);
-    textdomain (PACKAGE_GT);
-#endif
-#endif
-}
-
-
 
 
 /* Setup the debugging.  With a LEVEL of NULL only the active debug