From 7aa6a2ca98c3e90cd31138c6f76530587e5c7468 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 5 Jan 2006 21:08:02 +0000
Subject: [PATCH] Better fix to the epicsStrtod problem: Don't compile our
 function if epicsStrtod is a macro; that way you can't set a breakpoint on it
 which would never fire.

---
 src/libCom/misc/epicsStdlib.c | 6 +++---
 src/libCom/misc/epicsStdlib.h | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libCom/misc/epicsStdlib.c b/src/libCom/misc/epicsStdlib.c
index 35b695b26..2e2fd2e07 100644
--- a/src/libCom/misc/epicsStdlib.c
+++ b/src/libCom/misc/epicsStdlib.c
@@ -43,9 +43,8 @@ epicsShareFunc int epicsScanFloat(const char *str, float *dest)
     return 1;
 }
 
-#ifdef epicsStrtod
-# undef epicsStrtod
-#endif
+/* Systems with a working strtod() just #define epicsStrtod strtod */
+#ifndef epicsStrtod
 epicsShareFunc double epicsStrtod( 
     const char *str, char **endp)
 {
@@ -88,3 +87,4 @@ epicsShareFunc double epicsStrtod(
         *endp = (char *)cp;
     return num / den;
 }
+#endif
diff --git a/src/libCom/misc/epicsStdlib.h b/src/libCom/misc/epicsStdlib.h
index 391550404..84d4af062 100644
--- a/src/libCom/misc/epicsStdlib.h
+++ b/src/libCom/misc/epicsStdlib.h
@@ -18,7 +18,6 @@ extern "C" {
 
 epicsShareFunc int epicsScanDouble(const char *str, double *dest);
 epicsShareFunc int epicsScanFloat(const char *str, float *dest);
-epicsShareFunc double epicsStrtod(const char *str, char **endp);
 
 #include <stdlib.h>
 #include <osdStrtod.h>