aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-12-16 09:24:00 +0100
committerRichard Levitte <levitte@openssl.org>2016-12-16 14:43:49 +0100
commit97043e46aa7083c787a1efd72ac31ca97ed41610 (patch)
treeaa9b80dcfe886c77e4c8586db06ec2471407f9db
parentcd3fe0e09c97700005ed96c8113907cbdfc45edf (diff)
downloadopenssl-97043e46aa7083c787a1efd72ac31ca97ed41610.tar.gz
e_afalg: Don't warn about kernel version when pedantic
When built with --strict-warnings and the Linux kernel headers don't match the kernel version, the preprocessor warnings in engines/afalg/e_afalg.c cause compilation errors. Use the macro PEDANTIC to avoid those warnings in that case. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2095)
-rw-r--r--engines/afalg/e_afalg.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/afalg/e_afalg.c b/engines/afalg/e_afalg.c
index 8e019d4903..9837cae9c4 100644
--- a/engines/afalg/e_afalg.c
+++ b/engines/afalg/e_afalg.c
@@ -26,8 +26,10 @@
#define K_MIN2 0
#if LINUX_VERSION_CODE <= KERNEL_VERSION(K_MAJ, K_MIN1, K_MIN2) || \
!defined(AF_ALG)
-# warning "AFALG ENGINE requires Kernel Headers >= 4.1.0"
-# warning "Skipping Compilation of AFALG engine"
+# ifndef PEDANTIC
+# warning "AFALG ENGINE requires Kernel Headers >= 4.1.0"
+# warning "Skipping Compilation of AFALG engine"
+# endif
void engine_load_afalg_int(void);
void engine_load_afalg_int(void)
{