Navigation

← Previous Change
Next Change →

Changeset 249 for eaccelerator/trunk/win32

Timestamp:

07/27/06 16:45:55 (2 years ago)

Author:

bart

Message:

* Wrong ifdef in compile fix for php 5.2
* Update config.w32, VC6 and VC2005 project files
* Fix debug build for win32, this fixes ticket #149
* Removed a debug statement and added return value in optimizer.

Files:

eaccelerator/trunk/win32/eAccelerator.dsp (modified) (5 diffs)
eaccelerator/trunk/win32/eAccelerator.dsw (modified) (1 diff)
eaccelerator/trunk/win32/eAccelerator.sln (modified) (2 diffs)
eaccelerator/trunk/win32/eAccelerator.vcproj (modified) (5 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

eaccelerator/trunk/win32/eAccelerator.dsp

r219	r249
46	46	# PROP Target_Dir ""
47	47	# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
48		# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /D "NDEBUG" /D ZEND_DEBUG=0 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOADER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /D "WITH_EACCELERATOR_SHM" /D "WITH_EACCELERATOR_INFO" /YX /FD /c
	48	# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /I "../../" /D "NDEBUG" /D ZEND_DEBUG=0 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /D "WITH_EACCELERATOR_SHM" /D "WITH_EACCELERATOR_INFO" /YX /FD /c
49	49	# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
50	50	# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
…	…
72	72	# PROP Target_Dir ""
73	73	# ADD BASE CPP /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
74		# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /D "_DEBUG" /D ZEND_DEBUG=1 /D "DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOADER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /D "WITH_EACCELERATOR_SHM" /D "WITH_EACCELERATOR_INFO" /YX /FD /GZ /c
	74	# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /I "../../" /D "_DEBUG" /D ZEND_DEBUG=1 /D "DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /D "WITH_EACCELERATOR_SHM" /D "WITH_EACCELERATOR_INFO" /YX /FD /GZ /c
75	75	# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
76	76	# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
…	…
99	99	# PROP Target_Dir ""
100	100	# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D ZEND_DEBUG=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOADER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /YX /FD /GZ /c
101		# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /D "_DEBUG" /D ZEND_DEBUG=1 /D "DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOADER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /D "WITH_EACCELERATOR_SHM" /D "WITH_EACCELERATOR_INFO" /YX /FD /GZ /c
	101	# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /I "../../" /D "_DEBUG" /D ZEND_DEBUG=1 /D "DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /D "WITH_EACCELERATOR_SHM" /D "WITH_EACCELERATOR_INFO" /YX /FD /GZ /c
102	102	# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
103	103	# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
…	…
126	126	# PROP Target_Dir ""
127	127	# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /D "NDEBUG" /D ZEND_DEBUG=0 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOADER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /YX /FD /c
128		# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /D "NDEBUG" /D ZEND_DEBUG=0 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_ENCODER" /D "WITH_EACCELERATOR_LOADER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /D "WITH_EACCELERATOR_SHM" /D "WITH_EACCELERATOR_INFO" /YX /FD /c
	128	# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../.." /I "../../../zend" /I "../../../TSRM" /I "../../../main" /I "../../" /D "NDEBUG" /D ZEND_DEBUG=0 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_EACCELERATOR" /D "COMPILE_DL_EACCELERATOR" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D HAVE_EXT_SESSION_PHP_SESSION_H=1 /D "WITH_EACCELERATOR_CRASH_DETECTION" /D "WITH_EACCELERATOR_OPTIMIZER" /D "WITH_EACCELERATOR_SESSIONS" /D "WITH_EACCELERATOR_CONTENT_CACHING" /D "WITH_EACCELERATOR_SHM" /D "WITH_EACCELERATOR_INFO" /YX /FD /c
129	129	# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
130	130	# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
…	…
183	183	# Begin Source File
184	184
185		~~SOURCE=..\encoder.c~~
186		~~# End Source File~~
187		~~# Begin Source File~~
188
189		~~SOURCE=..\loader.c~~
190		~~# End Source File~~
191		~~# Begin Source File~~
192
193	185	SOURCE=..\mm.c
194	186	# End Source File

eaccelerator/trunk/win32/eAccelerator.dsw

r74	r249
5	5
6	6	Project: "eAccelerator"=".\eAccelerator.dsp" - Package Owner=<4>
7
8		~~Package=<5>~~
9		~~{{{~~
10		~~}}}~~
11
12		~~Package=<4>~~
13		~~{{{~~
14		~~}}}~~
15
16		~~###############################################################################~~
17
18		~~Project: "eLoader"=".\eLoader.dsp" - Package Owner=<4>~~
19	7
20	8	Package=<5>

eaccelerator/trunk/win32/eAccelerator.sln

r238	r249
3	3	# Visual Studio 2005
4	4	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eAccelerator", "eAccelerator.vcproj", "{F236792D-8DF1-49FA-9F36-2338F47C9DEB}"
5		~~EndProject~~
6		~~Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eLoader", "eLoader.vcproj", "{945FEBD1-AA09-445B-8C31-11270D6B2464}"~~
7	5	EndProject
8	6	Global
…	…
22	20	{F236792D-8DF1-49FA-9F36-2338F47C9DEB}.Release\|Win32.ActiveCfg = Release\|Win32
23	21	{F236792D-8DF1-49FA-9F36-2338F47C9DEB}.Release\|Win32.Build.0 = Release\|Win32
24		~~{945FEBD1-AA09-445B-8C31-11270D6B2464}.Debug PHP5\|Win32.ActiveCfg = Debug PHP5\|Win32~~
25		~~{945FEBD1-AA09-445B-8C31-11270D6B2464}.Debug PHP5\|Win32.Build.0 = Debug PHP5\|Win32~~
26		~~{945FEBD1-AA09-445B-8C31-11270D6B2464}.Debug\|Win32.ActiveCfg = Debug\|Win32~~
27		~~{945FEBD1-AA09-445B-8C31-11270D6B2464}.Debug\|Win32.Build.0 = Debug\|Win32~~
28		~~{945FEBD1-AA09-445B-8C31-11270D6B2464}.Release PHP5\|Win32.ActiveCfg = Release PHP5\|Win32~~
29		~~{945FEBD1-AA09-445B-8C31-11270D6B2464}.Release PHP5\|Win32.Build.0 = Release PHP5\|Win32~~
30		~~{945FEBD1-AA09-445B-8C31-11270D6B2464}.Release\|Win32.ActiveCfg = Release\|Win32~~
31		~~{945FEBD1-AA09-445B-8C31-11270D6B2464}.Release\|Win32.Build.0 = Release\|Win32~~
32	22	EndGlobalSection
33	23	GlobalSection(SolutionProperties) = preSolution

eaccelerator/trunk/win32/eAccelerator.vcproj

r238	r249
50	50	Optimization="2"
51	51	InlineFunctionExpansion="1"
52		AdditionalIncludeDirectories="../../..,../../../zend,../../../TSRM,../../../main"
53		PreprocessorDefinitions="NDEBUG;ZEND_DEBUG=0;WIN32;_WINDOWS;_USRDLL;HAVE_EACCELERATOR;COMPILE_DL_EACCELERATOR;ZEND_WIN32;PHP_WIN32;ZTS=1;HAVE_EXT_SESSION_PHP_SESSION_H=1;WITH_EACCELERATOR_CRASH_DETECTION;WITH_EACCELERATOR_OPTIMIZER;WITH_EACCELERATOR_~~ENCODER;WITH_EACCELERATOR_LOADER;WITH_EACCELERATOR_~~SESSIONS;WITH_EACCELERATOR_CONTENT_CACHING;WITH_EACCELERATOR_SHM;WITH_EACCELERATOR_INFO"
	52	AdditionalIncludeDirectories="../../..,../../../zend,../../../TSRM,../../../main,../../"
	53	PreprocessorDefinitions="NDEBUG;ZEND_DEBUG=0;WIN32;_WINDOWS;_USRDLL;HAVE_EACCELERATOR;COMPILE_DL_EACCELERATOR;ZEND_WIN32;PHP_WIN32;ZTS=1;HAVE_EXT_SESSION_PHP_SESSION_H=1;WITH_EACCELERATOR_CRASH_DETECTION;WITH_EACCELERATOR_OPTIMIZER;WITH_EACCELERATOR_SESSIONS;WITH_EACCELERATOR_CONTENT_CACHING;WITH_EACCELERATOR_SHM;WITH_EACCELERATOR_INFO"
54	54	StringPooling="true"
55	55	RuntimeLibrary="2"
…	…
144	144	<Tool
145	145	Name="VCCLCompilerTool"
146		AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE""
	146	AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" "
147	147	Optimization="2"
148	148	InlineFunctionExpansion="1"
149		AdditionalIncludeDirectories="../../..,../../../zend,../../../TSRM,../../../main"
	149	AdditionalIncludeDirectories="../../..,../../../zend,../../../TSRM,../../../main,../../"
150	150	PreprocessorDefinitions="NDEBUG;ZEND_DEBUG=0;WIN32;_WINDOWS;_USRDLL;HAVE_EACCELERATOR;COMPILE_DL_EACCELERATOR;ZEND_WIN32;PHP_WIN32;ZTS=1;HAVE_EXT_SESSION_PHP_SESSION_H=1;WITH_EACCELERATOR_CRASH_DETECTION;WITH_EACCELERATOR_OPTIMIZER;WITH_EACCELERATOR_ENCODER;WITH_EACCELERATOR_LOADER;WITH_EACCELERATOR_SESSIONS;WITH_EACCELERATOR_CONTENT_CACHING;WITH_EACCELERATOR_SHM;WITH_EACCELERATOR_INFO"
151	151	StringPooling="true"
…	…
241	241	<Tool
242	242	Name="VCCLCompilerTool"
243		AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE""
	243	AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" "
244	244	Optimization="0"
245		AdditionalIncludeDirectories="../../..,../../../zend,../../../TSRM,../../../main"
	245	AdditionalIncludeDirectories="../../..,../../../zend,../../../TSRM,../../../main,../../"
246	246	PreprocessorDefinitions="_DEBUG;ZEND_DEBUG=1;DEBUG;WIN32;_WINDOWS;_USRDLL;HAVE_EACCELERATOR;COMPILE_DL_EACCELERATOR;ZEND_WIN32;PHP_WIN32;ZTS=1;HAVE_EXT_SESSION_PHP_SESSION_H=1;WITH_EACCELERATOR_CRASH_DETECTION;WITH_EACCELERATOR_OPTIMIZER;WITH_EACCELERATOR_ENCODER;WITH_EACCELERATOR_LOADER;WITH_EACCELERATOR_SESSIONS;WITH_EACCELERATOR_CONTENT_CACHING;WITH_EACCELERATOR_SHM;WITH_EACCELERATOR_INFO"
247	247	MinimalRebuild="true"
…	…
339	339	<Tool
340	340	Name="VCCLCompilerTool"
341		AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE""
	341	AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" "
342	342	Optimization="0"
343		AdditionalIncludeDirectories="../../..,../../../zend,../../../TSRM,../../../main"
	343	AdditionalIncludeDirectories="../../..,../../../zend,../../../TSRM,../../../main,../../"
344	344	PreprocessorDefinitions="_DEBUG;ZEND_DEBUG=1;DEBUG;WIN32;_WINDOWS;_USRDLL;HAVE_EACCELERATOR;COMPILE_DL_EACCELERATOR;ZEND_WIN32;PHP_WIN32;ZTS=1;HAVE_EXT_SESSION_PHP_SESSION_H=1;WITH_EACCELERATOR_CRASH_DETECTION;WITH_EACCELERATOR_OPTIMIZER;WITH_EACCELERATOR_ENCODER;WITH_EACCELERATOR_LOADER;WITH_EACCELERATOR_SESSIONS;WITH_EACCELERATOR_CONTENT_CACHING;WITH_EACCELERATOR_SHM;WITH_EACCELERATOR_INFO"
345	345	MinimalRebuild="true"
…	…
694	694	<File
695	695	RelativePath="..\eaccelerator.c"
696		>
697		~~<FileConfiguration~~
698		~~Name="Release PHP5\|Win32"~~
699		>
700		~~<Tool~~
701		~~Name="VCCLCompilerTool"~~
702		~~AdditionalIncludeDirectories=""~~
703		~~PreprocessorDefinitions=""~~
704		/>
705		~~</FileConfiguration>~~
706		~~<FileConfiguration~~
707		~~Name="Release\|Win32"~~
708		>
709		~~<Tool~~
710		~~Name="VCCLCompilerTool"~~
711		~~AdditionalIncludeDirectories=""~~
712		~~PreprocessorDefinitions=""~~
713		/>
714		~~</FileConfiguration>~~
715		~~<FileConfiguration~~
716		~~Name="Debug\|Win32"~~
717		>
718		~~<Tool~~
719		~~Name="VCCLCompilerTool"~~
720		~~AdditionalIncludeDirectories=""~~
721		~~PreprocessorDefinitions=""~~
722		/>
723		~~</FileConfiguration>~~
724		~~<FileConfiguration~~
725		~~Name="Debug PHP5\|Win32"~~
726		>
727		~~<Tool~~
728		~~Name="VCCLCompilerTool"~~
729		~~AdditionalIncludeDirectories=""~~
730		~~PreprocessorDefinitions=""~~
731		/>
732		~~</FileConfiguration>~~
733		~~</File>~~
734		~~<File~~
735		~~RelativePath="..\encoder.c"~~
736		>
737		~~<FileConfiguration~~
738		~~Name="Release PHP5\|Win32"~~
739		>
740		~~<Tool~~
741		~~Name="VCCLCompilerTool"~~
742		~~AdditionalIncludeDirectories=""~~
743		~~PreprocessorDefinitions=""~~
744		/>
745		~~</FileConfiguration>~~
746		~~<FileConfiguration~~
747		~~Name="Release\|Win32"~~
748		>
749		~~<Tool~~
750		~~Name="VCCLCompilerTool"~~
751		~~AdditionalIncludeDirectories=""~~
752		~~PreprocessorDefinitions=""~~
753		/>
754		~~</FileConfiguration>~~
755		~~<FileConfiguration~~
756		~~Name="Debug\|Win32"~~
757		>
758		~~<Tool~~
759		~~Name="VCCLCompilerTool"~~
760		~~AdditionalIncludeDirectories=""~~
761		~~PreprocessorDefinitions=""~~
762		/>
763		~~</FileConfiguration>~~
764		~~<FileConfiguration~~
765		~~Name="Debug PHP5\|Win32"~~
766		>
767		~~<Tool~~
768		~~Name="VCCLCompilerTool"~~
769		~~AdditionalIncludeDirectories=""~~
770		~~PreprocessorDefinitions=""~~
771		/>
772		~~</FileConfiguration>~~
773		~~</File>~~
774		~~<File~~
775		~~RelativePath="..\loader.c"~~
776	696	>
777	697	<FileConfiguration

Download in other formats: