[git] W32PTH - branch, master, updated. w32pth-2.0.4-9-g24c11aa
by Werner Koch
cvs at cvs.gnupg.org
Tue Apr 23 18:55:09 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 "Pth Emulation for W32".
The branch, master has been updated
via 24c11aa203fe0c7bdbc0d851e8da60ddadef193e (commit)
via 0c2ede66f8404a3c99a7e46cebb166efddaffffd (commit)
from 980ba956de34ca7742c5e56fda482de65403284e (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 24c11aa203fe0c7bdbc0d851e8da60ddadef193e
Author: Werner Koch <wk at gnupg.org>
Date: Tue Apr 23 18:34:32 2013 +0200
Release 2.0.5.
diff --git a/NEWS b/NEWS
index 9e04560..c4a6516 100644
--- a/NEWS
+++ b/NEWS
@@ -1,16 +1,18 @@
-Noteworthy changes in version 2.0.5
+Noteworthy changes in version 2.0.5 (2013-04-23)
------------------------------------------------
* Fix regression in W32 timer handling introduced by 2.0.3.
+ * Switch to i686-w64-mingw32 as default toolchain.
-Noteworthy changes in version 2.0.4 (2010-08-02)
+
+Noteworthy changes in version 2.0.4 (2010-08-02)
------------------------------------------------
* Bug fix: Export pth_enter and pth_leave.
-Noteworthy changes in version 2.0.3 (2010-07-30)
+Noteworthy changes in version 2.0.3 (2010-07-30)
------------------------------------------------
* Support WindowsCE.
@@ -41,10 +43,10 @@ Noteworthy changes in version 2.0.1 (2007-08-16)
* Fixes. Better support for select.
-
+
Noteworthy changes in version 2.0.0 (2007-07-05)
------------------------------------------------
-
+
* First release. We need to use this unusually high version number
to indicate the version of Pth we are emulating.
diff --git a/configure.ac b/configure.ac
index 055956a..ae2c9e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,18 +1,18 @@
# configure.ac - for w32pth
# Copyright (C) 2007, 2008 g10 Code GmbH
-#
+#
# This file is part of W32PTH
-#
+#
# W32PTH is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2.1 of the
# License, or (at your option) any later version.
-#
+#
# W32PTH is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
@@ -26,7 +26,7 @@ min_automake_version="1.10"
# Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [2.0.4])
+m4_define([my_version], [2.0.5])
m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
@@ -45,7 +45,7 @@ AC_INIT([w32pth],
# Please remember to document interface changes in the NEWS file.
W32PTH_LT_CURRENT=2
W32PTH_LT_AGE=2
-W32PTH_LT_REVISION=1
+W32PTH_LT_REVISION=2
#-------------------
# If the API is changed in an incompatible way: increment the next counter.
W32PTH_CONFIG_API_VERSION=1
@@ -211,7 +211,7 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
# Generate extended version information for W32.
if test "$have_w32_system" = yes; then
BUILD_TIMESTAMP=`date --iso-8601=minutes`
- changequote(,)dnl
+ changequote(,)dnl
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
changequote([,])dnl
BUILD_FILEVERSION="${BUILD_FILEVERSION}${BUILD_REVISION}"
@@ -219,7 +219,7 @@ fi
AC_SUBST(BUILD_REVISION)
AC_SUBST(BUILD_TIMESTAMP)
AC_SUBST(BUILD_FILEVERSION)
-AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
+AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
[Subversion revision used to build this package])
@@ -233,7 +233,7 @@ AC_OUTPUT
echo "
W32PTH v${VERSION} has been configured as follows:
-
+
Platform: $host
"
commit 0c2ede66f8404a3c99a7e46cebb166efddaffffd
Author: Werner Koch <wk at gnupg.org>
Date: Tue Apr 23 18:31:54 2013 +0200
Allow building with newer mingw versions.
* autogen.sh <build-w32>: Try to use i686-w64-mingw32 first.
<build-w32>: Allow VPATH build.
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Use i686-w64-mingw32.
* pth.h: Include winsock2.h instead of windows.h. Also define
sigset_t if needed.
* w32-pth.c: Include winsock.h before windows.h.
diff --git a/Makefile.am b/Makefile.am
index 64b8791..d3ec49d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = no-dist-gzip dist-bzip2
-DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc
+DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32
EXTRA_DIST = autogen.sh pth-config.in libw32pth.def
diff --git a/autogen.sh b/autogen.sh
index 92b0ab1..ddaa907 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -95,12 +95,12 @@ if [ "$myhost" = "w32" ]; then
;;
*)
[ -z "$w32root" ] && w32root="$HOME/w32root"
- toolprefixes="i586-mingw32msvc i386-mingw32msvc"
+ toolprefixes="i686-w64-mingw32 i586-mingw32msvc i386-mingw32msvc"
extra_options=""
;;
esac
echo "Using $w32root as standard install directory" >&2
-
+
crossbindir=
for host in $toolprefixes; do
if ${host}-gcc --version >/dev/null 2>&1 ; then
@@ -127,7 +127,7 @@ if [ "$myhost" = "w32" ]; then
fi
fi
- ./configure --enable-maintainer-mode --prefix=${w32root} \
+ $tsdir/configure --enable-maintainer-mode --prefix=${w32root} \
--host=${host} --build=${build} ${extra_options} "$@"
exit $?
diff --git a/pth.h b/pth.h
index 60f4559..b114c05 100644
--- a/pth.h
+++ b/pth.h
@@ -30,14 +30,23 @@
#error w32pth conflict. A vanilla pth.h has already been included.
#endif
+#include <winsock2.h> /* Newer mingw version require this to be
+ included before windows.h. */
+
+/* #include <windows.h> /\* We need this for sockaddr et al. FIXME: too */
+/* heavyweight - may be we should factor such */
+/* code out to a second header and adjust all */
+/* user files to include it only if required. *\/ */
+
+/* Mingw64 defines sigset_t only of _POSIX is defined. We don't want
+ to do define this macro because we are a public header. Thus we
+ use a bit of mingw64 internal knowledge to declare sigset_t. */
+#include <sys/types.h>
+#if __MINGW64_VERSION_MAJOR >= 2 && !defined(_POSIX)
+typedef _sigset_t sigset_t;
+#endif /* mingw64 >= 2 */
-#include <windows.h> /* We need this for sockaddr et al. FIXME: too
- heavyweight - may be we should factor such
- code out to a second header and adjust all
- user files to include it only if required. */
-#include <sys/types.h> /* For sigset_t. */
-
#ifndef W32_PTH_HANDLE_INTERNAL
#define W32_PTH_HANDLE_INTERNAL int
#endif
diff --git a/w32-pth.c b/w32-pth.c
index 34162e1..e0fcf59 100644
--- a/w32-pth.c
+++ b/w32-pth.c
@@ -26,6 +26,7 @@
#include <config.h>
+#include <winsock2.h>
#include <windows.h>
#include <stdio.h>
#include <stdlib.h>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
NEWS | 12 +++++++-----
autogen.sh | 6 +++---
configure.ac | 18 +++++++++---------
pth.h | 19 ++++++++++++++-----
w32-pth.c | 1 +
6 files changed, 35 insertions(+), 23 deletions(-)
hooks/post-receive
--
Pth Emulation for W32
http://git.gnupg.org
More information about the Gnupg-commits
mailing list