R3.14.8.2

epicsStrtod fix.
We took epicsShareAPI out of Win32 already, which was the only arch that
2006-01-06 15:55:13 +00:00 · 2006-01-05 21:38:14 +00:00 · 2006-01-05 21:12:32 +00:00 · 2006-01-05 21:08:02 +00:00 · 2006-01-04 21:27:54 +00:00 · 2006-01-04 18:11:44 +00:00
10 changed files with 24 additions and 11 deletions
--- a/config/CONFIG.Host.WIN32
+++ b/config/CONFIG.Host.WIN32
@@ -96,13 +96,14 @@ ACC_SLIBS_NO=
 # Use of /Za would dissable DLL import/export keywords which
 # EPICS include/excludes using architecture neutral macros
 #
-# /GX support C++ exceptions
+# /EHsc support C++ exceptions
 # /GR generate RTTI information
 #
-CCC = cl /GX /GR
+CCC = cl /EHsc /GR
 CCC_NORMAL = $(CCC) /nologo /D__STDC__=0
 CCC_STRICT = $(CCC) /nologo /D__STDC__=0
 CCC_TEMPL_INST_FLAG =
+ARCH_DEP_CPPFLAGS += /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE

 #
 # /W<N> use warning level N
--- a/configure/CONFIG_BASE_VERSION
+++ b/configure/CONFIG_BASE_VERSION
@@ -27,7 +27,7 @@ EPICS_REVISION = 14
 EPICS_MODIFICATION = 8

 # Not included if zero
-EPICS_PATCH_LEVEL = 1
+EPICS_PATCH_LEVEL = 2

 # This will be -CVS or empty at an official release point
 #EPICS_CVS_SNAPSHOT=-CVS
--- a/configure/os/CONFIG.win32-x86.win32-x86
+++ b/configure/os/CONFIG.win32-x86.win32-x86
@@ -105,12 +105,13 @@ CPP = cl /C /E
 # Use of /Za would dissable DLL import/export keywords which
 # include/excludes using architecture neutral macros
 # 
-# /GX - generate code for exceptions
+# /EHsc - generate code for exceptions
 # /GR - generate code for run time type identification
 #
-CCC = cl /nologo /GX /GR
+CCC = cl /nologo /EHsc /GR
 CONFORM_CXXFLAGS_NORMAL =
 CONFORM_CXXFLAGS_STRICT = /D__STDC__=0
+CODE_CPPFLAGS += /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE

 #
 # /W<N> use warning level N
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -7,7 +7,16 @@
 </head>

 <body lang="en">
-<h1 align="center">EPICS Base Release 3.14.8.1</h1>
+<h1 align="center">EPICS Base Release 3.14.8.2</h1>
+
+<h2 align="center">Changes since 3.14.8.1</h2>
+
+<h4>epicsStrtod</h4>
+
+<p>On architectures whose native version of strtod() actually works properly
+(i.e. converts +/-Inf[inity] and NaN strings to their double equivalents) we
+managed to break the use of this in the R3.14.8.1 release.  This is now
+fixed.</p>

 <h2 align="center">Changes since 3.14.8</h2>

--- a/src/libCom/misc/epicsStdlib.c
+++ b/src/libCom/misc/epicsStdlib.c
@@ -43,6 +43,8 @@ epicsShareFunc int epicsScanFloat(const char *str, float *dest)
    return 1;
 }

+/* Systems with a working strtod() just #define epicsStrtod strtod */
+#ifndef epicsStrtod
 epicsShareFunc double epicsStrtod( 
    const char *str, char **endp)
 {
@@ -85,3 +87,4 @@ epicsShareFunc double epicsStrtod(
        *endp = (char *)cp;
    return num / den;
 }
+#endif
--- 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>
--- a/src/libCom/osi/os/RTEMS/osdStrtod.h
+++ b/src/libCom/osi/os/RTEMS/osdStrtod.h
@@ -12,4 +12,4 @@
 /*
 * epicsStrtod() for systems with broken strtod() routine
 */
-epicsShareFunc double epicsShareAPI epicsStrtod(const char *str, char **endp); 
+epicsShareFunc double epicsStrtod(const char *str, char **endp); 
--- a/src/libCom/osi/os/cygwin32/osdStrtod.h
+++ b/src/libCom/osi/os/cygwin32/osdStrtod.h
@@ -12,4 +12,4 @@
 /*
 * epicsStrtod() for systems with broken strtod() routine
 */
-epicsShareFunc double epicsShareAPI epicsStrtod(const char *str, char **endp); 
+epicsShareFunc double epicsStrtod(const char *str, char **endp); 
--- a/src/libCom/osi/os/hpux/osdStrtod.h
+++ b/src/libCom/osi/os/hpux/osdStrtod.h
@@ -12,4 +12,4 @@
 /*
 * epicsStrtod() for systems with broken strtod() routine
 */
-epicsShareFunc double epicsShareAPI epicsStrtod(const char *str, char **endp); 
+epicsShareFunc double epicsStrtod(const char *str, char **endp); 
--- a/src/libCom/osi/os/vxWorks/osdStrtod.h
+++ b/src/libCom/osi/os/vxWorks/osdStrtod.h
@@ -12,4 +12,4 @@
 /*
 * epicsStrtod() for systems with broken strtod() routine
 */
-epicsShareFunc double epicsShareAPI epicsStrtod(const char *str, char **endp); 
+epicsShareFunc double epicsStrtod(const char *str, char **endp);
Author	SHA1	Message	Date
Janet B. Anderson	e9b49d233b	R3.14.8.2	2006-01-06 15:55:13 +00:00
Andrew Johnson	16e0409813	epicsStrtod fix.	2006-01-05 21:38:14 +00:00
Andrew Johnson	10c03d3e19	We took epicsShareAPI out of Win32 already, which was the only arch that might have needed it!	2006-01-05 21:12:32 +00:00
Andrew Johnson	7aa6a2ca98	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.	2006-01-05 21:08:02 +00:00
Ken Evans	705d8ccf98	Added _CRT_NONSTDC_NO_DEPRECATE switch to disable MSVC 8 Posix deprecated warnings.	2006-01-04 21:27:54 +00:00
Ken Evans	ae27b2ad0e	Changed /GX to /EHsc and defined _CRT_SECURE_NO_DEPRECATE for MSVC 8.	2006-01-04 18:11:44 +00:00
W. Eric Norum	8d3dc9eb33	Avoid infinite recursion on systems with 'working' strtod() functions.	2005-12-26 18:32:43 +00:00
Janet B. Anderson	1e821d866e	Set EPICS_CVS_SNAPSHOT to -CVS.	2005-12-20 15:25:07 +00:00