[svn] gcry - r1436 - in trunk: . src

[svn author wk]

Author: wk
Date: 2010-07-09 10:21:44 +0200 (Fri, 09 Jul 2010)
New Revision: 1436

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/gcrypt.h.in
Log:
Minor changes for MSVC.
Bumped LT version because we need to add an inetrface in the 1.4 branch.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-06-29 17:14:35 UTC (rev 1435)
+++ trunk/ChangeLog	2010-07-09 08:21:44 UTC (rev 1436)
@@ -1,3 +1,8 @@
+2010-07-09  Werner Koch  <wk at 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 at g10code.de>
 
 	* configure.ac: Check for -fno-strict-aliasing.
@@ -59,7 +64,7 @@
 
 2009-01-22  Werner Koch  <wk at 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 at g10code.com>

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-06-29 17:14:35 UTC (rev 1435)
+++ trunk/src/ChangeLog	2010-07-09 08:21:44 UTC (rev 1436)
@@ -1,3 +1,8 @@
+2010-07-09  Werner Koch  <wk at g10code.com>
+
+	* gcrypt.h.in [!__GNUC__ && W32]: Typedef ssize_t and pid_t to
+	help building with MSVC.
+
 2010-06-24  Werner Koch  <wk at g10code.com>
 
 	* gcrypt.h.in [W32]: Include time.h and not sys/time.h.
@@ -8,7 +13,8 @@
 
 2010-04-16  Marcus Brinkmann  <marcus at 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.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-06-29 17:14:35 UTC (rev 1435)
+++ trunk/configure.ac	2010-07-09 08:21:44 UTC (rev 1436)
@@ -41,9 +41,11 @@
 #   (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
 
 

Modified: trunk/src/gcrypt.h.in
===================================================================
--- trunk/src/gcrypt.h.in	2010-06-29 17:14:35 UTC (rev 1435)
+++ trunk/src/gcrypt.h.in	2010-07-09 08:21:44 UTC (rev 1436)
@@ -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>