Skip to content

Commit

Permalink
build: fix pendantic with recent tools
Browse files Browse the repository at this point in the history
Signed-off-by: Alon Bar-Lev <[email protected]>
  • Loading branch information
alonbl committed Dec 2, 2016
1 parent 2ccb555 commit ef4f946
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
19 changes: 10 additions & 9 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/_pkcs11h-crypto-mbedtls.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit ef4f946

Please sign in to comment.