summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac8
-rw-r--r--src/ChangeLog8
-rw-r--r--src/gcrypt.h.in5
4 files changed, 22 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f2dbb645..82dc0485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-09 Werner Koch <wk@g10code.com>
+
+ * configure.ac: Bump LT version to C18/A7/R0 to prepare a backport
+ of a new API to the 1.4 series.
+
2010-04-19 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for -fno-strict-aliasing.
@@ -59,7 +64,7 @@
2009-01-22 Werner Koch <wk@g10code.com>
- * configure.ac: Bump LT version to C17/A7/R0 to mark the start of
+ * configure.ac: Bump LT version to C17/A6/R0 to mark the start of
a new development series.
2009-01-22 Werner Koch <wk@g10code.com>
diff --git a/configure.ac b/configure.ac
index d05c9cb5..9cb99ef4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,9 +41,11 @@ AC_INIT([libgcrypt],
# (Interfaces removed: CURRENT++, AGE=0, REVISION=0)
# (Interfaces added: CURRENT++, AGE++, REVISION=0)
# (No interfaces changed: REVISION++)
-# NOTE: As an exception the the LT versions are already set for 1.5.0!
-LIBGCRYPT_LT_CURRENT=17
-LIBGCRYPT_LT_AGE=6
+
+# NOTE: As an exception during development of this branch the LT
+# versions are already set for 1.5.0!
+LIBGCRYPT_LT_CURRENT=18
+LIBGCRYPT_LT_AGE=7
LIBGCRYPT_LT_REVISION=0
diff --git a/src/ChangeLog b/src/ChangeLog
index cdca915c..26cb5bcf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-09 Werner Koch <wk@g10code.com>
+
+ * gcrypt.h.in [!__GNUC__ && W32]: Typedef ssize_t and pid_t to
+ help building with MSVC.
+
2010-06-24 Werner Koch <wk@g10code.com>
* gcrypt.h.in [W32]: Include time.h and not sys/time.h.
@@ -8,7 +13,8 @@
2010-04-16 Marcus Brinkmann <marcus@g10code.de>
- * sexp.c: (sexp_sscan): Make it variable length, and rename the old version to ...
+ * sexp.c: (sexp_sscan): Make it variable length, and rename the
+ old version to ...
(vsexp_sscan): ... this new function. Also swap last two arguments.
(gcry_sexp_create): Remove dummy va_list.
(gcry_sexp_build): Use vsexp_sscan instead of sexp_sscan.
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index 33b52ff5..5b9939db 100644
--- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in
@@ -1,6 +1,6 @@
/* gcrypt.h - GNU Cryptographic Library Interface -*- c -*-
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006
- 2007, 2008, 2009 Free Software Foundation, Inc.
+ 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of Libgcrypt.
@@ -34,7 +34,10 @@
# include <winsock2.h>
# include <ws2tcpip.h>
# include <time.h>
+# ifndef __GNUC__
typedef long ssize_t;
+ typedef int pid_t;
+# endif /*!__GNUC__*/
#else
# include <sys/socket.h>
# include <sys/time.h>