From efc57958a1bcb630e29f3600bedee4073ecf6359 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Mon, 24 Mar 2014 03:49:44 +0000
Subject: libsylph/ssl_hostname_validation.h: added include guard.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3364 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog                          |  6 +++++-
 libsylph/ssl_hostname_validation.h | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3df543cb..65f58022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-24
+
+	* libsylph/ssl_hostname_validation.h: added include guard.
+
 2014-03-20
 
 	* src/icons/html.png: modified the size of HTML icon.
@@ -7,7 +11,7 @@
 	* libsylph/ssl.c
 	  libsylph/ssl_hostname_validation.c: implemented wildcard certificate
 	  validation (based on libcurl). Treat hostname validation failure
-	  like other errors.
+	  like other errors. Fixed compile error on --disable-ssl.
 
 2014-03-19
 
diff --git a/libsylph/ssl_hostname_validation.h b/libsylph/ssl_hostname_validation.h
index beade37f..4a24ae3c 100644
--- a/libsylph/ssl_hostname_validation.h
+++ b/libsylph/ssl_hostname_validation.h
@@ -28,6 +28,17 @@
  * Modified naming convention to match LibSylph.
  *
  */
+
+#ifndef __SSL_HOSTNAME_VALIDATION_H__
+#define __SSL_HOSTNAME_VALIDATION_H__
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#if USE_SSL
+
+#include <openssl/x509.h>
  
 typedef enum {
 	SSL_HOSTNAME_MATCH_FOUND,
@@ -49,3 +60,7 @@ typedef enum {
 * Returns Error if there was an error.
 */
 SSLHostnameValidationResult ssl_validate_hostname(const char *hostname, const X509 *server_cert);
+
+#endif /* USE_SSL */
+
+#endif /* __SSL_HOSTNAME_VALIDATION_H__ */
-- 
cgit v1.2.3