From 87b47d5859c21344042617554ed3bf7bfd72f770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <address@hidden>
Date: Wed, 5 Apr 2017 15:41:34 +0200
Subject: [PATCH 2/2] Silence -Wundef for checking HAVE_OPENSSL_* defines

* lib/md5.c, lib/md5.h: #if -> #ifdef
* lib/sha1.c, lib/sha1.h: Likewise
* lib/sha256.c, lib/sha256.h: Likewise
* lib/sha512.c, lib/sha512.h: Likewise
---
 lib/md5.c    | 2 +-
 lib/md5.h    | 4 ++--
 lib/sha1.c   | 2 +-
 lib/sha1.h   | 4 ++--
 lib/sha256.c | 2 +-
 lib/sha256.h | 4 ++--
 lib/sha512.c | 2 +-
 lib/sha512.h | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/md5.c b/lib/md5.c
index 9f5237ec5..22e370f49 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#if HAVE_OPENSSL_MD5
+#ifdef HAVE_OPENSSL_MD5
 # define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
 #endif
 #include "md5.h"
diff --git a/lib/md5.h b/lib/md5.h
index 9c2c09815..996481a95 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
-# if HAVE_OPENSSL_MD5
+# ifdef HAVE_OPENSSL_MD5
 #  include <openssl/md5.h>
 # endif
 
@@ -61,7 +61,7 @@
 extern "C" {
 # endif
 
-# if HAVE_OPENSSL_MD5
+# ifdef HAVE_OPENSSL_MD5
 #  define GL_OPENSSL_NAME 5
 #  include "gl_openssl.h"
 # else
diff --git a/lib/sha1.c b/lib/sha1.c
index 87c57719e..2b814b333 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#if HAVE_OPENSSL_SHA1
+#ifdef HAVE_OPENSSL_SHA1
 # define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
 #endif
 #include "sha1.h"
diff --git a/lib/sha1.h b/lib/sha1.h
index 38e82f363..90ce5f0d1 100644
--- a/lib/sha1.h
+++ b/lib/sha1.h
@@ -22,7 +22,7 @@
 # include <stdio.h>
 # include <stdint.h>
 
-# if HAVE_OPENSSL_SHA1
+# ifdef HAVE_OPENSSL_SHA1
 #  include <openssl/sha.h>
 # endif
 
@@ -32,7 +32,7 @@ extern "C" {
 
 #define SHA1_DIGEST_SIZE 20
 
-# if HAVE_OPENSSL_SHA1
+# ifdef HAVE_OPENSSL_SHA1
 #  define GL_OPENSSL_NAME 1
 #  include "gl_openssl.h"
 # else
diff --git a/lib/sha256.c b/lib/sha256.c
index 03d3899ad..b3362751b 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#if HAVE_OPENSSL_SHA256
+#ifdef HAVE_OPENSSL_SHA256
 # define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
 #endif
 #include "sha256.h"
diff --git a/lib/sha256.h b/lib/sha256.h
index ffb91fa47..6e77a17c4 100644
--- a/lib/sha256.h
+++ b/lib/sha256.h
@@ -21,7 +21,7 @@
 # include <stdio.h>
 # include <stdint.h>
 
-# if HAVE_OPENSSL_SHA256
+# ifdef HAVE_OPENSSL_SHA256
 #  include <openssl/sha.h>
 # endif
 
@@ -32,7 +32,7 @@ extern "C" {
 enum { SHA224_DIGEST_SIZE = 224 / 8 };
 enum { SHA256_DIGEST_SIZE = 256 / 8 };
 
-# if HAVE_OPENSSL_SHA256
+# ifdef HAVE_OPENSSL_SHA256
 #  define GL_OPENSSL_NAME 224
 #  include "gl_openssl.h"
 #  define GL_OPENSSL_NAME 256
diff --git a/lib/sha512.c b/lib/sha512.c
index 6876bfdb0..d10c951c5 100644
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#if HAVE_OPENSSL_SHA512
+#ifdef HAVE_OPENSSL_SHA512
 # define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
 #endif
 #include "sha512.h"
diff --git a/lib/sha512.h b/lib/sha512.h
index 121e6c3a2..3eb6662a2 100644
--- a/lib/sha512.h
+++ b/lib/sha512.h
@@ -21,7 +21,7 @@
 # include <stdio.h>
 # include "u64.h"
 
-# if HAVE_OPENSSL_SHA512
+# ifdef HAVE_OPENSSL_SHA512
 #  include <openssl/sha.h>
 # endif
 
@@ -32,7 +32,7 @@ extern "C" {
 enum { SHA384_DIGEST_SIZE = 384 / 8 };
 enum { SHA512_DIGEST_SIZE = 512 / 8 };
 
-# if HAVE_OPENSSL_SHA512
+# ifdef HAVE_OPENSSL_SHA512
 #  define GL_OPENSSL_NAME 384
 #  include "gl_openssl.h"
 #  define GL_OPENSSL_NAME 512
-- 
2.11.0