[pkg-opensc-commit] [pkcs11-helper] 241/253: build: fix pendantic with recent tools

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository pkcs11-helper.

commit ef4f946ecd6f786c53ffb624a6f7532571deb870
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Fri Dec 2 10:07:25 2016 +0200

    build: fix pendantic with recent tools
    
    Signed-off-by: Alon Bar-Lev <alon.barlev at gmail.com>
---
 configure.ac                  | 19 ++++++++++---------
 lib/_pkcs11h-crypto-mbedtls.c |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index def3c5b..5465252 100644
--- a/configure.ac
+++ b/configure.ac
@@ -398,11 +398,21 @@ if test -n "${MBEDTLS_CFLAGS}" -a "${have_mbedtls}" = "yes"; then
 	CFLAGS="${old_CFLAGS}"
 fi
 
+if test "${enable_pedantic}" = "yes"; then
+	enable_strict="yes"
+	CFLAGS="${CFLAGS} -ansi -pedantic -D__STRICT_ANSI__ -D_ISOC99_SOURCE -D_DEFAULT_SOURCE"
+fi
+
+if test "${enable_strict}" = "yes"; then
+	CFLAGS="${CFLAGS} -Wall -Wextra -Wpointer-arith -Wsign-compare -Wno-unused-parameter -Wno-unused-function -Wno-variadic-macros"
+fi
+
 # Checks for header files.
 AC_HEADER_STDC
 AX_CPP_VARARG_MACRO_ISO
 AX_CPP_VARARG_MACRO_GCC
 AC_C_CONST
+AC_C_INLINE
 AC_C_VOLATILE
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
@@ -511,15 +521,6 @@ else
 	AC_MSG_RESULT([no])
 fi
 
-if test "${enable_pedantic}" = "yes"; then
-	enable_strict="yes"
-	CFLAGS="${CFLAGS} -ansi -pedantic -D__STRICT_ANSI__ -D_ISOC99_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE"
-fi
-
-if test "${enable_strict}" = "yes"; then
-	CFLAGS="${CFLAGS} -Wall -Wextra -Wpointer-arith -Wsign-compare -Wno-unused-parameter -Wno-unused-function"
-fi
-
 if test "${enable_threading}" != "yes" -a "${enable_slotevent}" = "yes"; then
 	AC_MSG_ERROR([Threading must be enabled for slotevent to be enabled])
 fi
diff --git a/lib/_pkcs11h-crypto-mbedtls.c b/lib/_pkcs11h-crypto-mbedtls.c
index 215798e..21557e5 100644
--- a/lib/_pkcs11h-crypto-mbedtls.c
+++ b/lib/_pkcs11h-crypto-mbedtls.c
@@ -176,7 +176,7 @@ __pkcs11h_crypto_mbedtls_certificate_is_issuer (
 ) {
 	x509_crt x509_issuer;
 	x509_crt x509_cert;
-	int verify_flags = 0;
+	uint32_t verify_flags = 0;
 
 	PKCS11H_BOOL is_issuer = FALSE;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git