From 302dcc99236b1e5b1a905c8808cc25a4988492e0 Mon Sep 17 00:00:00 2001
From: mvandervoord <mvandervoord@bf332499-1b4d-0410-844d-d2d48d5cc64c>
Date: Wed, 28 Jan 2009 13:44:26 +0000
Subject: [PATCH] Made example project a little more friendly to various
 compilers.

git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@54 bf332499-1b4d-0410-844d-d2d48d5cc64c
---
 examples/src/TemperatureCalculator.c |  4 ++++
 examples/src/Types.h                 | 35 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/examples/src/TemperatureCalculator.c b/examples/src/TemperatureCalculator.c
index 7f0bab2..ff07846 100644
--- a/examples/src/TemperatureCalculator.c
+++ b/examples/src/TemperatureCalculator.c
@@ -2,6 +2,10 @@
 #include "TemperatureCalculator.h"
 #include <math.h>
 
+#ifndef logl
+#define logl log
+#endif
+
 float TemperatureCalculator_Calculate(uint16 millivolts)
 {
   const double supply_voltage = 3.0;
diff --git a/examples/src/Types.h b/examples/src/Types.h
index 04335e1..67f91a1 100644
--- a/examples/src/Types.h
+++ b/examples/src/Types.h
@@ -37,17 +37,52 @@ typedef char bool;
 #define DONT_CARE (0)
 
 // MIN/MAX Definitions for Standard Types
+#ifndef INT8_MAX
 #define INT8_MAX 127
+#endif
+
+#ifndef INT8_MIN
 #define INT8_MIN (-128)
+#endif
+
+#ifndef UINT8_MAX
 #define UINT8_MAX 0xFFU
+#endif
+
+#ifndef UINT8_MIN
 #define UINT8_MIN 0x00U
+#endif
+
+#ifndef INT16_MAX
 #define INT16_MAX 32767
+#endif
+
+#ifndef INT16_MIN
 #define INT16_MIN (-32768)
+#endif
+
+#ifndef UINT16_MAX
 #define UINT16_MAX 0xFFFFU
+#endif
+
+#ifndef UINT16_MIN
 #define UINT16_MIN 0x0000U
+#endif
+
+#ifndef INT32_MAX
 #define INT32_MAX 0x7FFFFFFF
+#endif
+
+#ifndef INT32_MIN
 #define INT32_MIN (-INT32_MAX - 1)
+#endif
+
+#ifndef UINT32_MAX
 #define UINT32_MAX 0xFFFFFFFFU
+#endif
+
+#ifndef UINT32_MIN
 #define UINT32_MIN 0x00000000U
+#endif
 
 #endif // _MYTYPES_H_