From 3ba8734fffee3ee0baacb9f40168922adf89a048 Mon Sep 17 00:00:00 2001 From: Jeffrey Lee <jlee@gitlab.riscosopen.org> Date: Sat, 10 Dec 2011 19:13:50 +0000 Subject: [PATCH] Fix heap test compile errors Detail: TestSrc/HeapTest/c/testbed - Added missing semicolon TestSrc/HeapTest/s/asm - Include Hdr:MsgTrans for XMessageTrans_CopyError Admin: Now compiles and runs properly! Version 5.35, 4.79.2.129. Tagged as 'Kernel-5_35-4_79_2_129' --- Dev/HeapTest/c/testbed | 8 +------- Dev/HeapTest/s/asm | 1 + VersionASM | 6 +++--- VersionNum | 8 ++++---- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Dev/HeapTest/c/testbed b/Dev/HeapTest/c/testbed index 420ee13..79a6141 100644 --- a/Dev/HeapTest/c/testbed +++ b/Dev/HeapTest/c/testbed @@ -13,12 +13,6 @@ * limitations under the License. */ -/* OS_Heap testbed code. Creates a heap and randomly allocates/deallocates/ - resizes blocks of memory to test for any bugs. Tests can either be performed - using the OS_Heap SWI or by compiling a special version of the heap code - from the kernel source folder (see USE_LOCAL_OSHEAP #define and s.asm) -*/ - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -292,7 +286,7 @@ int main(int argc,char **argv) _kernel_oserror *err; /* TODO - Take parameters from command line */ - _swix(OS_ReadMonotonicTime,_OUT(0),&seed) + _swix(OS_ReadMonotonicTime,_OUT(0),&seed); allocsize = 8*1024; init(); diff --git a/Dev/HeapTest/s/asm b/Dev/HeapTest/s/asm index f136f9e..cc2b2d6 100644 --- a/Dev/HeapTest/s/asm +++ b/Dev/HeapTest/s/asm @@ -27,6 +27,7 @@ GET Hdr:FSNumbers GET Hdr:HighFSI GET Hdr:NewErrors + GET Hdr:MsgTrans ; Disable internationalisation GBLL International diff --git a/VersionASM b/VersionASM index 5648e2f..c70775b 100644 --- a/VersionASM +++ b/VersionASM @@ -13,11 +13,11 @@ GBLS Module_ComponentPath Module_MajorVersion SETS "5.35" Module_Version SETA 535 -Module_MinorVersion SETS "4.79.2.128" +Module_MinorVersion SETS "4.79.2.129" Module_Date SETS "10 Dec 2011" Module_ApplicationDate SETS "10-Dec-11" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.128)" -Module_HelpVersion SETS "5.35 (10 Dec 2011) 4.79.2.128" +Module_FullVersion SETS "5.35 (4.79.2.129)" +Module_HelpVersion SETS "5.35 (10 Dec 2011) 4.79.2.129" END diff --git a/VersionNum b/VersionNum index bb184ae..3c9a097 100644 --- a/VersionNum +++ b/VersionNum @@ -5,12 +5,12 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.128 +#define Module_MinorVersion_CMHG 4.79.2.129 #define Module_Date_CMHG 10 Dec 2011 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.128" +#define Module_MinorVersion "4.79.2.129" #define Module_Date "10 Dec 2011" #define Module_ApplicationDate "10-Dec-11" @@ -18,6 +18,6 @@ #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.128)" -#define Module_HelpVersion "5.35 (10 Dec 2011) 4.79.2.128" +#define Module_FullVersion "5.35 (4.79.2.129)" +#define Module_HelpVersion "5.35 (10 Dec 2011) 4.79.2.129" #define Module_LibraryVersionInfo "5:35" -- GitLab