diff options
| author | Werner Koch <wk@gnupg.org> | 2010-07-09 08:21:44 +0000 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2010-07-09 08:21:44 +0000 |
| commit | 2ea261fe3c3ae818d0ac13e2c63d2ac9525a0dcc (patch) | |
| tree | c6638abec0ac41f551cfc5a59990a1e8b1e2ab5f /src | |
| parent | 6dc4847a38ce9617879273266fee371672a6d451 (diff) | |
| download | libgcrypt-2ea261fe3c3ae818d0ac13e2c63d2ac9525a0dcc.tar.gz | |
Minor changes for MSVC.
Bumped LT version because we need to add an inetrface in the 1.4 branch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/gcrypt.h.in | 5 |
2 files changed, 11 insertions, 2 deletions
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> |