commit f2561b3f694b8af2becd9dab0167dbb17135d3a2
author Paul Bakker <p.j.bakker@polarssl.org> Thu Feb 06 15:11:55 2014 +0100
committer Paul Bakker <p.j.bakker@polarssl.org> Thu Feb 06 15:32:26 2014 +0100
tree 4fdaf7e66c2e34f13aaac386f9f8e0472ff3eb2b
parent 64abd83b672d6789efed4dfab08d450aa82a37a0

Ability to provide alternate timing implementation

library/timing.c

diff --git a/library/timing.c b/library/timing.c
index 1b4311c..c70b78c 100644
--- a/library/timing.c
+++ b/library/timing.c
@@ -1,7 +1,7 @@
 /*
  *  Portable interface to the CPU cycle counter
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -25,7 +25,7 @@
 
 #include "polarssl/config.h"
 
-#if defined(POLARSSL_TIMING_C)
+#if defined(POLARSSL_TIMING_C) && !defined(POLARSSL_TIMING_ALT)
 
 #include "polarssl/timing.h"