[svn] gcry - r1435 - trunk/src

[svn author wk]

Author: wk
Date: 2010-06-29 19:14:35 +0200 (Tue, 29 Jun 2010)
New Revision: 1435

Modified:
   trunk/src/ChangeLog
   trunk/src/gcrypt.h.in
   trunk/src/sexp.c
Log:
fixes for msvc compiler


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-06-10 09:06:46 UTC (rev 1434)
+++ trunk/src/ChangeLog	2010-06-29 17:14:35 UTC (rev 1435)
@@ -1,3 +1,7 @@
+2010-06-24  Werner Koch  <wk at g10code.com>
+
+	* gcrypt.h.in [W32]: Include time.h and not sys/time.h.
+
 2010-04-19  Marcus Brinkmann  <marcus at g10code.de>
 
 	* misc.c (write2stderr): Dummy variable to silence gcc warning.

Modified: trunk/src/gcrypt.h.in
===================================================================
--- trunk/src/gcrypt.h.in	2010-06-10 09:06:46 UTC (rev 1434)
+++ trunk/src/gcrypt.h.in	2010-06-29 17:14:35 UTC (rev 1435)
@@ -33,14 +33,15 @@
 #if defined _WIN32 || defined __WIN32__
 # include <winsock2.h>
 # include <ws2tcpip.h>
+# include <time.h>
+  typedef long ssize_t;
 #else
 # include <sys/socket.h>
+# include <sys/time.h>
 #endif /*!_WIN32*/
 
 @FALLBACK_SOCKLEN_T@
 
-#include <sys/time.h>
-
 /* This is required for error code compatibility. */
 #define _GCRY_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GCRYPT
 

Modified: trunk/src/sexp.c
===================================================================
--- trunk/src/sexp.c	2010-06-10 09:06:46 UTC (rev 1434)
+++ trunk/src/sexp.c	2010-06-29 17:14:35 UTC (rev 1435)
@@ -1838,7 +1838,7 @@
 }
 
 
-/* Scan a cannocial encoded buffer with implicit length values and
+/* Scan a canonical encoded buffer with implicit length values and
    return the actual length this S-expression uses.  For a valid S-Exp
    it should never return 0.  If LENGTH is not zero, the maximum
    length to scan is given - this can be used for syntax checks of