cvs: ZendEngine2(PHP_5_0) / Zend.dsp ZendTS.dsp zend_strtod.c zend_strtod.h

edink Wed Nov 3 21:21:11 2004 EDT Modified files: (Branch: PHP_5_0) /ZendEngine2 Zend.dsp ZendTS.dsp zend_strtod.c zend_strtod.h Log: MFH: zend_strtod compilation on windows http://cvs.php.net/diff.php/ZendEngine2/Zend.dsp?r1=1.24&r2=1.24.2.1&ty=u Index: ZendEngine2/Zend.dsp diff -u ZendEngine2/Zend.dsp:1.24 ZendEngine2/Zend.dsp:1.24.2.1 --- ZendEngine2/Zend.dsp:1.24 Thu Oct 23 00:41:09 2003 +++ ZendEngine2/Zend.dsp Wed Nov 3 21:21:10 2004 @@ -7,20 +7,20 @@ CFG=Zend - Win32 Release_inline !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "Zend.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -95,7 +95,7 @@ # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ENDIF +!ENDIF # Begin Target @@ -135,10 +135,6 @@ # End Source File # Begin Source File -SOURCE=.\zend_interfaces.c -# End Source File -# Begin Source File - SOURCE=.\zend_dynamic_array.c # End Source File # Begin Source File @@ -179,6 +175,10 @@ # End Source File # Begin Source File +SOURCE=.\zend_interfaces.c +# End Source File +# Begin Source File + SOURCE=".\zend_language_parser.c" # End Source File # Begin Source File @@ -243,6 +243,10 @@ # End Source File # Begin Source File +SOURCE=.\zend_strtod.c +# End Source File +# Begin Source File + SOURCE=.\zend_ts_hash.c # End Source File # Begin Source File @@ -291,10 +295,6 @@ # End Source File # Begin Source File -SOURCE=.\zend_interfaces.h -# End Source File -# Begin Source File - SOURCE=.\zend_dynamic_array.h # End Source File # Begin Source File @@ -351,6 +351,10 @@ # End Source File # Begin Source File +SOURCE=.\zend_interfaces.h +# End Source File +# Begin Source File + SOURCE=.\zend_istdiostream.h # End Source File # Begin Source File @@ -415,6 +419,10 @@ # End Source File # Begin Source File +SOURCE=.\zend_strtod.h +# End Source File +# Begin Source File + SOURCE=.\zend_ts_hash.h # End Source File # Begin Source File @@ -449,7 +457,7 @@ !ELSEIF "$(CFG)" == "Zend - Win32 Release_inline" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -504,7 +512,7 @@ $(BuildCmds) # End Custom Build -!ENDIF +!ENDIF # End Source File # End Group @@ -533,7 +541,7 @@ !ELSEIF "$(CFG)" == "Zend - Win32 Release_inline" -!ENDIF +!ENDIF # End Source File # Begin Source File @@ -570,7 +578,7 @@ # End Custom Build -!ENDIF +!ENDIF # End Source File # End Group http://cvs.php.net/diff.php/ZendEngine2/ZendTS.dsp?r1=1.46&r2=1.46.2.1&ty=u Index: ZendEngine2/ZendTS.dsp diff -u ZendEngine2/ZendTS.dsp:1.46 ZendEngine2/ZendTS.dsp:1.46.2.1 --- ZendEngine2/ZendTS.dsp:1.46 Thu Feb 12 05:38:13 2004 +++ ZendEngine2/ZendTS.dsp Wed Nov 3 21:21:10 2004 @@ -276,6 +276,10 @@ # End Source File # Begin Source File +SOURCE=.\zend_strtod.c +# End Source File +# Begin Source File + SOURCE=.\zend_ts_hash.c # End Source File # Begin Source File @@ -452,6 +456,10 @@ # End Source File # Begin Source File +SOURCE=.\zend_strtod.h +# End Source File +# Begin Source File + SOURCE=.\zend_ts_hash.h # End Source File # Begin Source File http://cvs.php.net/diff.php/ZendEngine2/zend_strtod.c?r1=1.1.2.1&r2=1.1.2.2&ty=u Index: ZendEngine2/zend_strtod.c diff -u ZendEngine2/zend_strtod.c:1.1.2.1 ZendEngine2/zend_strtod.c:1.1.2.2 --- ZendEngine2/zend_strtod.c:1.1.2.1 Wed Nov 3 18:14:32 2004 +++ ZendEngine2/zend_strtod.c Wed Nov 3 21:21:10 2004 @@ -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 @@ #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 @@ #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 @@ #endif #endif - double +ZEND_API double zend_strtod #ifdef KR_headers (s00, se) CONST char *s00; char **se; http://cvs.php.net/diff.php/ZendEngine2/zend_strtod.h?r1=1.1.2.1&r2=1.1.2.2&ty=u Index: ZendEngine2/zend_strtod.h diff -u ZendEngine2/zend_strtod.h:1.1.2.1 ZendEngine2/zend_strtod.h:1.1.2.2 --- ZendEngine2/zend_strtod.h:1.1.2.1 Wed Nov 3 18:14:32 2004 +++ ZendEngine2/zend_strtod.h Wed Nov 3 21:21:10 2004 @@ -16,13 +16,16 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_strtod.h,v 1.1.2.1 2004/11/03 23:14:32 derick Exp $ */ +/* $Id: zend_strtod.h,v 1.1.2.2 2004/11/04 02:21:10 edink Exp $ */ /* This is a header file for the strtod implementation by David M. Gay which * 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