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

[svn author marcus]

Author: marcus
Date: 2006-10-12 23:08:41 +0200 (Thu, 12 Oct 2006)
New Revision: 1183

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/gcrypt.h.in
Log:
2006-10-12  Marcus Brinkmann  <marcus at g10code.de>

        * configure.ac (FALLBACK_SOCKLEN_T): Third time is a charm.
        Define gcry_socklen_t, to avoid conflicts with socklen_t
        definitions by autoconf.

src/
2006-10-12  Marcus Brinkmann  <marcus at g10code.de>

        * gcrypt.h.in: Replace socklen_t with gcry_socklen_t.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-10-11 12:25:50 UTC (rev 1182)
+++ trunk/ChangeLog	2006-10-12 21:08:41 UTC (rev 1183)
@@ -1,3 +1,9 @@
+2006-10-12  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac (FALLBACK_SOCKLEN_T): Third time is a charm.
+	Define gcry_socklen_t, to avoid conflicts with socklen_t
+	definitions by autoconf.
+
 2006-10-11  Marcus Brinkmann  <marcus at g10code.de>
 
 	* configure.ac (FALLBACK_SOCKLEN_T): Rewrite in terms of

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-10-11 12:25:50 UTC (rev 1182)
+++ trunk/configure.ac	2006-10-12 21:08:41 UTC (rev 1183)
@@ -522,9 +522,9 @@
 
 gl_TYPE_SOCKLEN_T
 if test ".$gl_cv_socklen_t_equiv" = "."; then
-  FALLBACK_SOCKLEN_T="/* typedef socklen_t socklen_t; */"
+  FALLBACK_SOCKLEN_T="typedef socklen_t gcry_socklen_t; */"
 else
-  FALLBACK_SOCKLEN_T="typedef ${gl_cv_socklen_t_equiv} socklen_t;"
+  FALLBACK_SOCKLEN_T="typedef ${gl_cv_socklen_t_equiv} gcry_socklen_t;"
 fi
 AC_SUBST(FALLBACK_SOCKLEN_T)
 

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-10-11 12:25:50 UTC (rev 1182)
+++ trunk/src/ChangeLog	2006-10-12 21:08:41 UTC (rev 1183)
@@ -1,3 +1,7 @@
+2006-10-12  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gcrypt.h.in: Replace socklen_t with gcry_socklen_t.
+
 2006-10-11  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gcrypt.h.in: Replace version by @VERSION at .

Modified: trunk/src/gcrypt.h.in
===================================================================
--- trunk/src/gcrypt.h.in	2006-10-11 12:25:50 UTC (rev 1182)
+++ trunk/src/gcrypt.h.in	2006-10-12 21:08:41 UTC (rev 1183)
@@ -184,15 +184,15 @@
 		     struct timeval *timeout);
   ssize_t (*waitpid) (pid_t pid, int *status, int options);
   int (*accept) (int s, void  *addr, int *length_ptr);
-  int (*connect) (int s, void *addr, socklen_t length);
+  int (*connect) (int s, void *addr, gcry_socklen_t length);
   int (*sendmsg) (int s, const void *msg, int flags);
   int (*recvmsg) (int s, void *msg, int flags);
 #else
   ssize_t (*select) (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
 		     struct timeval *timeout);
   ssize_t (*waitpid) (pid_t pid, int *status, int options);
-  int (*accept) (int s, struct sockaddr *addr, socklen_t *length_ptr);
-  int (*connect) (int s, struct sockaddr *addr, socklen_t length);
+  int (*accept) (int s, struct sockaddr *addr, gcry_socklen_t *length_ptr);
+  int (*connect) (int s, struct sockaddr *addr, gcry_socklen_t length);
   int (*sendmsg) (int s, const struct msghdr *msg, int flags);
   int (*recvmsg) (int s, struct msghdr *msg, int flags);
 #endif
@@ -240,9 +240,10 @@
 static ssize_t gcry_pth_waitpid (pid_t pid, int *status, int options)	      \
   { return pth_waitpid (pid, status, options); }			      \
 static int gcry_pth_accept (int s, struct sockaddr *addr,		      \
-			    socklen_t *length_ptr)			      \
+			    gcry_socklen_t *length_ptr)			      \
   { return pth_accept (s, addr, length_ptr); }				      \
-static int gcry_pth_connect (int s, struct sockaddr *addr, socklen_t length)  \
+static int gcry_pth_connect (int s, struct sockaddr *addr,		      \
+			     gcry_socklen_t length)			      \
   { return pth_connect (s, addr, length); }				      \
 									      \
 /* FIXME: GNU Pth is missing pth_sendmsg and pth_recvmsg.  */		      \