[svn] gcry - r1441 - in trunk: . cipher src tests
svn author wk
cvs at cvs.gnupg.org
Mon Aug 16 10:45:50 CEST 2010
Author: wk
Date: 2010-08-16 10:45:49 +0200 (Mon, 16 Aug 2010)
New Revision: 1441
Modified:
trunk/cipher/cipher.c
trunk/configure.ac
trunk/src/ChangeLog
trunk/src/gcrypt.h.in
trunk/tests/ChangeLog
trunk/tests/Makefile.am
Log:
Insert sys/select.h to be POSIXly correct.
Typo fixes.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2010-07-19 13:56:04 UTC (rev 1440)
+++ trunk/src/ChangeLog 2010-08-16 08:45:49 UTC (rev 1441)
@@ -1,3 +1,7 @@
+2010-08-16 Werner Koch <wk at g10code.com>
+
+ * gcrypt.h.in [!WIN32]: Add INSERT_SYS_SELECT_H autoconf substitute.
+
2010-07-09 Werner Koch <wk at g10code.com>
* gcrypt.h.in [!__GNUC__ && W32]: Typedef ssize_t and pid_t to
Modified: trunk/tests/ChangeLog
===================================================================
--- trunk/tests/ChangeLog 2010-07-19 13:56:04 UTC (rev 1440)
+++ trunk/tests/ChangeLog 2010-08-16 08:45:49 UTC (rev 1441)
@@ -1,3 +1,7 @@
+2010-07-19 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (LDADD): Add GPG_ERROR_LIBS to help a new wannabe ld.
+
2010-06-10 Werner Koch <wk at g10code.com>
* t-mpi-bit.c (mpi2bitstr_nlz): Handle case for LENGTH==0.
Modified: trunk/cipher/cipher.c
===================================================================
--- trunk/cipher/cipher.c 2010-07-19 13:56:04 UTC (rev 1440)
+++ trunk/cipher/cipher.c 2010-08-16 08:45:49 UTC (rev 1441)
@@ -194,7 +194,7 @@
struct {
unsigned int key:1; /* Set to 1 if a key has been set. */
- unsigned int iv:1; /* Set to 1 if ae IV has been set. */
+ unsigned int iv:1; /* Set to 1 if a IV has been set. */
} marks;
/* The initialization vector. To help code optimization we make
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2010-07-19 13:56:04 UTC (rev 1440)
+++ trunk/configure.ac 2010-08-16 08:45:49 UTC (rev 1441)
@@ -607,7 +607,13 @@
AC_HEADER_STDC
AC_CHECK_HEADERS(unistd.h sys/select.h sys/msg.h)
+INSERT_SYS_SELECT_H=
+if test x"$ac_cv_header_sys_select_h" = xyes; then
+ INSERT_SYS_SELECT_H=" include <sys/select.h>"
+fi
+AC_SUBST(INSERT_SYS_SELECT_H)
+
##########################################
#### Checks for typedefs, structures, ####
#### and compiler characteristics. ####
Modified: trunk/src/gcrypt.h.in
===================================================================
--- trunk/src/gcrypt.h.in 2010-07-19 13:56:04 UTC (rev 1440)
+++ trunk/src/gcrypt.h.in 2010-08-16 08:45:49 UTC (rev 1441)
@@ -41,6 +41,7 @@
#else
# include <sys/socket.h>
# include <sys/time.h>
+#@INSERT_SYS_SELECT_H@
#endif /*!_WIN32*/
@FALLBACK_SOCKLEN_T@
Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am 2010-07-19 13:56:04 UTC (rev 1440)
+++ trunk/tests/Makefile.am 2010-08-16 08:45:49 UTC (rev 1441)
@@ -36,7 +36,7 @@
AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
AM_CFLAGS = $(GPG_ERROR_CFLAGS)
-LDADD = ../src/libgcrypt.la $(DL_LIBS) ../compat/libcompat.la
+LDADD = ../src/libgcrypt.la $(DL_LIBS) ../compat/libcompat.la $(GPG_ERROR_LIB)
EXTRA_PROGRAMS = testapi pkbench
noinst_PROGRAMS = $(TESTS) fipsdrv rsacvt
More information about the Gnupg-commits
mailing list