MFH: zend_strtod compilation on windows

diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
index 6bf9b43416191aca37b7f6f46f271b30b115cfe6..83791c0c4aef8867528f180c6c367c70d0541f85 100644 (file)
--- a/Zend/Zend.dsp
+++ b/Zend/Zend.dsp
@@ -7,20 +7,20 @@
 CFG=Zend - Win32 Release_inline\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE NMAKE /f "Zend.mak".\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline"\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")\r
-!MESSAGE\r
+!MESSAGE \r
 \r
 # Begin Project\r
 # PROP AllowPerConfigDependencies 0\r
@@ -95,7 +95,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo\r
 # ADD LIB32 /nologo\r
 \r
-!ENDIF\r
+!ENDIF \r
 \r
 # Begin Target\r
 \r
@@ -135,10 +135,6 @@ SOURCE=.\zend_default_classes.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\zend_interfaces.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\zend_dynamic_array.c\r
 # End Source File\r
 # Begin Source File\r
@@ -179,6 +175,10 @@ SOURCE=.\zend_ini_scanner.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_interfaces.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=".\zend_language_parser.c"\r
 # End Source File\r
 # Begin Source File\r
@@ -243,6 +243,10 @@ SOURCE=.\zend_stream.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_strtod.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_ts_hash.c\r
 # End Source File\r
 # Begin Source File\r
@@ -291,10 +295,6 @@ SOURCE=.\zend_default_classes.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\zend_interfaces.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\zend_dynamic_array.h\r
 # End Source File\r
 # Begin Source File\r
@@ -351,6 +351,10 @@ SOURCE=.\zend_ini_scanner.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_interfaces.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_istdiostream.h\r
 # End Source File\r
 # Begin Source File\r
@@ -415,6 +419,10 @@ SOURCE=.\zend_stream.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_strtod.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_ts_hash.h\r
 # End Source File\r
 # Begin Source File\r
@@ -449,7 +457,7 @@ BuildCmds= \
 \r
 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"\r
 \r
-!ENDIF\r
+!ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
@@ -504,7 +512,7 @@ BuildCmds= \
    $(BuildCmds)\r
 # End Custom Build\r
 \r
-!ENDIF\r
+!ENDIF \r
 \r
 # End Source File\r
 # End Group\r
@@ -533,7 +541,7 @@ InputPath=.\zend_ini_scanner.l
 \r
 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"\r
 \r
-!ENDIF\r
+!ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
@@ -570,7 +578,7 @@ InputPath=".\zend_language_scanner.l"
 \r
 # End Custom Build\r
 \r
-!ENDIF\r
+!ENDIF \r
 \r
 # End Source File\r
 # End Group\r

diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp
index 76b4e46e5f4aa02f4b9e3af13d19635de3c5f913..830f97efd2cb1619d4b280a0b8ef29cc2fac3f29 100644 (file)
--- a/Zend/ZendTS.dsp
+++ b/Zend/ZendTS.dsp
@@ -276,6 +276,10 @@ SOURCE=.\zend_stream.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_strtod.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_ts_hash.c\r
 # End Source File\r
 # Begin Source File\r
@@ -452,6 +456,10 @@ SOURCE=.\zend_stream.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_strtod.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_ts_hash.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c
index 4fe98f3ed9ac9cb2a4b483dba175c811a22bbcc3..9fbaf38838d84e6c67e38e8f9651a66a267988a6 100644 (file)
--- a/Zend/zend_strtod.c
+++ b/Zend/zend_strtod.c
@@ -89,6 +89,8 @@
  *     directly -- and assumed always to succeed.
  */
 
+#include <zend_strtod.h>
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char *rcsid = "$OpenBSD: strtod.c,v 1.19 2004/02/03 16:52:11 drahn Exp $";
 #endif /* LIBC_SCCS and not lint */
@@ -118,6 +120,12 @@ static char *rcsid = "$OpenBSD: strtod.c,v 1.19 2004/02/03 16:52:11 drahn Exp $"
 #define VAX
 #endif
 
+#if defined(_MSC_VER)
+#define int32_t __int32
+#define u_int32_t unsigned __int32
+#define IEEE_LITTLE_ENDIAN
+#endif
+
 #define Long   int32_t
 #define ULong  u_int32_t
 
@@ -362,10 +370,6 @@ extern double rnd_prod(double, double), rnd_quot(double, double);
 
 #define Kmax 15
 
-#ifdef __cplusplus
-extern "C" double zend_strtod(const char *s00, char **se);
-#endif
-
  struct
 Bigint {
        struct Bigint *next;
@@ -1215,7 +1219,7 @@ static CONST double tinytens[] = { 1e-16, 1e-32 };
 #endif
 #endif
 
- double
+ZEND_API double
 zend_strtod
 #ifdef KR_headers
        (s00, se) CONST char *s00; char **se;

diff --git a/Zend/zend_strtod.h b/Zend/zend_strtod.h
index 3c7820645eae7754f35fecec768bd602e61cf104..2fbaceaedde79605130462ee6c3db9571b58019e 100644 (file)
--- a/Zend/zend_strtod.h
+++ b/Zend/zend_strtod.h
@@ -22,7 +22,10 @@
  * can be found in zend_strtod.c */
 #ifndef ZEND_STRTOD_H
 #define ZEND_STRTOD_H
+#include <zend.h>
 
-double zend_strtod(const char *s00, char **se);
+BEGIN_EXTERN_C()
+ZEND_API double zend_strtod(const char *s00, char **se);
+END_EXTERN_C()
 
 #endif

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index d1882da73dd6f8b91d7013824d4e6ccfbc6efd92..14f74d9ec315f2157abcdcb9544cdd290b4b5b0d 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -183,7 +183,7 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
        zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \
        zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
        zend_object_handlers.c zend_objects_API.c \
-       zend_mm.c zend_default_classes.c zend_reflection_api.c zend_execute.c");
+       zend_mm.c zend_default_classes.c zend_reflection_api.c zend_execute.c zend_strtod.c");
 
 ADD_SOURCES("main", "main.c snprintf.c spprintf.c safe_mode.c fopen_wrappers.c \
        php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \