Remove unused function.

Update changelog for r1027504, r1033856, r1033882.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1033884 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 9616f90..4a248f7 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e022895..e3fd46c 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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).