Author: kkolinko
Date: Thu Nov 11 11:07:02 2010
New Revision: 1033884
URL: http://svn.apache.org/viewvc?rev=1033884&view=rev
Log:
Remove unused function.
Update changelog for r1027504, r1033856, r1033882.
Modified:
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1033884&r1=1033883&r2=1033884&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Nov 11 11:07:02 2010
@@ -399,31 +399,6 @@ FunctionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SecExamples} $(DESC_SecExamples)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
-; =====================
-; findCpuType Function
-; =====================
-;
-; Find the CPU used on the system, and put the result on the top of the
-; stack
-;
-Function findCpuType
-
- ClearErrors
- ; Default CPU is always x86
- StrCpy $1 "x86"
- ExpandEnvStrings $0 "%PROCESSOR_ARCHITEW6432%"
- StrCmp $0 "%PROCESSOR_ARCHITEW6432%" +5 0
- StrCmp $0 "IA64" 0 +3
- StrCpy $1 "i64"
- Goto FoundCpu
- StrCpy $1 "x64"
-
-FoundCpu:
- ; Put the result in the stack
- Push $1
-
-FunctionEnd
-
; =====================
; CheckUserType Function
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1033884&r1=1033883&r2=1033884&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 11 11:07:02 2010
@@ -228,7 +228,7 @@
the user to select either a 32-bit JDK or a 64-bit JDK. If a 32-bit JDK
is selected, the 32-bit service wrapper and the 32-bit native DLL will
be installed. If a 64-bit JDK is selected, the 64-bit service wrapper
- and the 64-bit native DLL will be installed. (markt)
+ and the 64-bit native DLL will be installed. (markt/kkolinko)
</add>
<fix>
<bug>49819</bug>: Redesign of home page by Pid (pidster at apache).
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
