summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2010-10-14 15:55:07 +0200
committerSimon Josefsson <simon@josefsson.org>2010-10-14 15:57:49 +0200
commitb44da6f3924d0cb05233636521a87aa996940427 (patch)
tree71806de01345e12f01cbb1be742f15bcf3a45231
parentdbe767085787f5fdec183749a86c279a28676cc8 (diff)
downloadgnutls-b44da6f3924d0cb05233636521a87aa996940427.tar.gz
Fix syntax-check warning.
-rw-r--r--.x-sc_two_space_separator_in_usage2
-rw-r--r--lib/cryptodev.c2
-rw-r--r--lib/m4/hooks.m44
-rw-r--r--lib/pakchois/pakchois11.h8
4 files changed, 8 insertions, 8 deletions
diff --git a/.x-sc_two_space_separator_in_usage b/.x-sc_two_space_separator_in_usage
index ec74edbb63..d1f9e0ce61 100644
--- a/.x-sc_two_space_separator_in_usage
+++ b/.x-sc_two_space_separator_in_usage
@@ -1,3 +1,3 @@
^build-aux/gnupload
-^doc/gnutls.texi
+^doc/.*.texi
^tests/sha2/sha2
diff --git a/lib/cryptodev.c b/lib/cryptodev.c
index 10a88fcf8e..fb74be75f2 100644
--- a/lib/cryptodev.c
+++ b/lib/cryptodev.c
@@ -276,7 +276,7 @@ _gnutls_cryptodev_deinit (void)
/* if we are using linux /dev/crypto
*/
-#if defined(COP_FLAG_UPDATE)
+#if defined COP_FLAG_UPDATE
static const int gnutls_mac_map[] = {
[GNUTLS_MAC_MD5] = CRYPTO_MD5_HMAC,
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index ecd4c54348..c4d6e00573 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -45,10 +45,10 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
libgcrypt=$withval,
libgcrypt=no)
if test "$libgcrypt" = "yes"; then
- cryptolib=libgcrypt
+ cryptolib=libgcrypt
AC_DEFINE([HAVE_GCRYPT], 1, [whether the gcrypt library is in use])
AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [#include <gcrypt.h>],
- [enum gcry_cipher_algos i = GCRY_CIPHER_CAMELLIA128])
+ [enum gcry_cipher_algos i = GCRY_CIPHER_CAMELLIA128])
if test "$ac_cv_libgcrypt" != yes; then
AC_MSG_ERROR([[
***
diff --git a/lib/pakchois/pakchois11.h b/lib/pakchois/pakchois11.h
index e5056ce2d5..7539b385fa 100644
--- a/lib/pakchois/pakchois11.h
+++ b/lib/pakchois/pakchois11.h
@@ -53,7 +53,7 @@
#ifndef PKCS11_H
#define PKCS11_H 1
-#if defined(__cplusplus)
+#ifdef __cplusplus
extern "C"
{
#endif
@@ -79,7 +79,7 @@ extern "C"
/* System dependencies. */
-#if defined(_WIN32) || defined(CRYPTOKI_FORCE_WIN32)
+#if defined _WIN32 || defined CRYPTOKI_FORCE_WIN32
/* There is a matching pop below. */
#pragma pack(push, cryptoki, 1)
@@ -1341,11 +1341,11 @@ ck_rv_t CK_SPEC name args
/* System dependencies. */
-#if defined(_WIN32) || defined(CRYPTOKI_FORCE_WIN32)
+#if defined _WIN32 || defined CRYPTOKI_FORCE_WIN32
#pragma pack(pop, cryptoki)
#endif
-#if defined(__cplusplus)
+#ifdef __cplusplus
}
#endif