[git] Assuan - branch, master, updated. libassuan-2.1.0-4-g6ba18ca
by Werner Koch
cvs at cvs.gnupg.org
Wed Jun 19 13:55:21 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPC library used by GnuPG".
The branch, master has been updated
via 6ba18ca32c8669fa76cc10de3382f78212ca51a8 (commit)
via f88eb9e98f491b503f46c7d995c9651f1e46b9e9 (commit)
via 61f5ca41e9d44bdd266cb4e91abe45fc5f2ddf3e (commit)
from fb51987dcdb2e6e2a4c25d45f891e15c013457aa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6ba18ca32c8669fa76cc10de3382f78212ca51a8
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 19 13:29:18 2013 +0200
Changes to support W64.
* configure.ac (have_dosish_system): Set for W64.
* src/assuan-defs.h (SOCKET2HANDLE, HANDLE2SOCKET): Add versions for
W64.
* src/assuan-handler.c (assuan_command_parse_fd) [W64]: Use strtoull
to parse an FD.
--
Note that these changes are not complete but merely sufficient to
allow building of GpgEX.
diff --git a/configure.ac b/configure.ac
index 67860a7..369a447 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,7 @@ case "${host}" in
fi
;;
x86_64-*mingw32*)
+ have_dosish_system=yes
have_w32_system=yes
have_w64_system=yes
;;
diff --git a/src/assuan-defs.h b/src/assuan-defs.h
index f6cb9b4..63329c8 100644
--- a/src/assuan-defs.h
+++ b/src/assuan-defs.h
@@ -397,12 +397,15 @@ int _assuan_asprintf (char **buf, const char *fmt, ...);
#define DIM(v) (sizeof(v)/sizeof((v)[0]))
-#if HAVE_W32_SYSTEM
-#define SOCKET2HANDLE(s) ((void *)(s))
-#define HANDLE2SOCKET(h) ((unsigned int)(h))
+#if HAVE_W64_SYSTEM
+# define SOCKET2HANDLE(s) ((void *)(s))
+# define HANDLE2SOCKET(h) ((uintptr_t)(h))
+#elif HAVE_W32_SYSTEM
+# define SOCKET2HANDLE(s) ((void *)(s))
+# define HANDLE2SOCKET(h) ((unsigned int)(h))
#else
-#define SOCKET2HANDLE(s) (s)
-#define HANDLE2SOCKET(h) (h)
+# define SOCKET2HANDLE(s) (s)
+# define HANDLE2SOCKET(h) (h)
#endif
diff --git a/src/assuan-handler.c b/src/assuan-handler.c
index dca5968..2fa91b8 100644
--- a/src/assuan-handler.c
+++ b/src/assuan-handler.c
@@ -271,9 +271,9 @@ assuan_command_parse_fd (assuan_context_t ctx, char *line, assuan_fd_t *rfd)
line ++;
if (!digitp (*line))
return set_error (ctx, GPG_ERR_ASS_SYNTAX, "number required");
-#ifdef HAVE_W32_SYSTEM
- /* Fixme: For a W32/64bit system we will need to change the cast
- and the conversion function. */
+#if HAVE_W64_SYSTEM
+ *rfd = (void*)strtoull (line, &endp, 10);
+#elif HAVE_W32_SYSTEM
*rfd = (void*)strtoul (line, &endp, 10);
#else
*rfd = strtoul (line, &endp, 10);
commit f88eb9e98f491b503f46c7d995c9651f1e46b9e9
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jun 17 16:11:23 2013 +0200
Add hack to have different names for 64 bit Windows DLLs.
* ltmain.sh: Prefix the SO number for W64 with a "6".
--
We need to stick to libtool 2.4.2 anyway, thus we take the easy way
and hack libtool instead of adding "-release 6" to the Makefile. This
also avoids an extra dash before the 6 and thus yields a prettier name
than the one produced by the -release option. The header files and
def files are supposed to be identical for w32 and w64 thus we don't
need to do any special code for them.
Having a different namespace for 64 bit DLLs is such a good idea that
I hope this or a similar feature will be provided by future libtool
versions.
diff --git a/ltmain.sh b/ltmain.sh
index 6f650ae..d47c0ba 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -6748,6 +6748,11 @@ func_mode_link ()
elif test -n "$soname_spec"; then
# bleh windows
case $host in
+ x86_64-*mingw32*)
+ func_arith $current - $age
+ major=$func_arith_result
+ versuffix="6-$major"
+ ;;
*cygwin* | mingw* | *cegcc*)
func_arith $current - $age
major=$func_arith_result
@@ -7480,6 +7485,14 @@ func_mode_link ()
func_arith $current - $age
major=$func_arith_result
versuffix="-$major"
+ case $host in
+ x86_64-*mingw32*)
+ versuffix="6-$major"
+ ;;
+ *)
+ versuffix="-$major"
+ ;;
+ esac
;;
*)
commit 61f5ca41e9d44bdd266cb4e91abe45fc5f2ddf3e
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jun 17 16:01:19 2013 +0200
Support building for w64.
diff --git a/autogen.sh b/autogen.sh
index 991e782..4e0987f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -41,12 +41,15 @@ w32_toolprefixes=
w32_extraoptions=
w32ce_toolprefixes=
w32ce_extraoptions=
+w64_toolprefixes=
+w64_extraoptions=
amd64_toolprefixes=
# End list of optional variables sourced from ~/.gnupg-autogen.rc
# What follows are variables which are sourced but default to
# environment variables or lacking them hardcoded values.
#w32root=
#w32ce_root=
+#w64root=
#amd64root=
if [ -f "$HOME/.gnupg-autogen.rc" ]; then
@@ -102,7 +105,7 @@ if [ "$myhost" = "w32" ]; then
64)
w32root="$w64root"
[ -z "$w32root" ] && w32root="$HOME/w64root"
- toolprefixes="$amd64_toolprefixes amd64-mingw32msvc"
+ toolprefixes="$w64_toolprefixes x86_64-w64-mingw32"
;;
*)
[ -z "$w32root" ] && w32root="$HOME/w32root"
-----------------------------------------------------------------------
Summary of changes:
autogen.sh | 5 ++++-
configure.ac | 1 +
ltmain.sh | 13 +++++++++++++
src/assuan-defs.h | 13 ++++++++-----
src/assuan-handler.c | 6 +++---
5 files changed, 29 insertions(+), 9 deletions(-)
hooks/post-receive
--
IPC library used by GnuPG
http://git.gnupg.org
More information about the Gnupg-commits
mailing list