commit 9bcf16c55dcee7d5d241be11df63e26c42b62457
author Paul Bakker <p.j.bakker@polarssl.org> Mon Jun 24 19:31:17 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Jun 25 15:06:53 2013 +0200
tree af57cf77551084d63f7bf641301dc2e065c8d78c
parent 28144decefe530d9c28e09c7dbd5e3c8e3152615

Centralized module option values in config.h

Allow user-defined settings without editing header files by using
POLARSSL_CONFIG_OPTIONS in config.h
(cherry picked from commit 6fa5488779c5b50bf13f9250e19d25c6c6cf9bcf)

Conflicts:
	include/polarssl/config.h

include/polarssl/ssl_cache.h

diff --git a/include/polarssl/ssl_cache.h b/include/polarssl/ssl_cache.h
index 0b3d5cc..c47330d 100644
--- a/include/polarssl/ssl_cache.h
+++ b/include/polarssl/ssl_cache.h
@@ -3,7 +3,7 @@
  *
  * \brief SSL session cache implementation
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -29,8 +29,10 @@
 
 #include "ssl.h"
 
+#if !defined(POLARSSL_CONFIG_OPTIONS)
 #define SSL_CACHE_DEFAULT_TIMEOUT       86400   /*!< 1 day  */
 #define SSL_CACHE_DEFAULT_MAX_ENTRIES      50   /*!< Maximum entries in cache */
+#endif /* !POLARSSL_CONFIG_OPTIONS */
 
 #ifdef __cplusplus
 extern "C" {