From 79b1ba01016da00b5b44da4d54fda125852b8442 Mon Sep 17 00:00:00 2001 From: Stephanie Gawroriski Date: Sun, 8 Sep 2024 16:10:31 +0000 Subject: [PATCH] Compile fixes. --- nanocoat/frontend/emulator/nativeAllocSizeOf.c | 2 +- nanocoat/frontend/emulator/nativeNvmBootParam.c | 2 +- nanocoat/frontend/emulator/nativeNvmState.c | 2 +- nanocoat/frontend/emulator/nativeVirtualLibrary.c | 2 +- nanocoat/frontend/emulator/nativeVirtualSuite.c | 2 +- nanocoat/frontend/libjvm/vmInit.c | 2 +- nanocoat/tests/testDescBinaryName.c | 2 +- nanocoat/tests/testDescClassName.c | 2 +- nanocoat/tests/testDescFieldType.c | 2 +- nanocoat/tests/testDescIdentifier.c | 2 +- nanocoat/tests/testDescMethodType.c | 2 +- nanocoat/tests/testNvmLocalPopDouble.c | 2 +- nanocoat/tests/testNvmLocalPopFloat.c | 2 +- nanocoat/tests/testNvmLocalPopInteger.c | 2 +- nanocoat/tests/testNvmLocalPopLong.c | 2 +- nanocoat/tests/testNvmLocalPopReference.c | 2 +- nanocoat/tests/testRomSuiteClassPathById.c | 2 +- nanocoat/tests/testRomSuiteClassPathByName.c | 2 +- nanocoat/tests/testRomSuiteLibraries.c | 2 +- nanocoat/tests/testTaskSpawn.c | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/nanocoat/frontend/emulator/nativeAllocSizeOf.c b/nanocoat/frontend/emulator/nativeAllocSizeOf.c index 6c366fc4d4..d84a5c09ab 100644 --- a/nanocoat/frontend/emulator/nativeAllocSizeOf.c +++ b/nanocoat/frontend/emulator/nativeAllocSizeOf.c @@ -9,7 +9,7 @@ #include -#include "sjme/allocSizeOf.h" +#include "sjme/nvm/allocSizeOf.h" #include "frontend/emulator/jniHelper.h" jint SJME_JNI_METHOD(SJME_CLASS_ALLOC_SIZEOF, _1_1size) diff --git a/nanocoat/frontend/emulator/nativeNvmBootParam.c b/nanocoat/frontend/emulator/nativeNvmBootParam.c index 22417974cd..327bd6883a 100644 --- a/nanocoat/frontend/emulator/nativeNvmBootParam.c +++ b/nanocoat/frontend/emulator/nativeNvmBootParam.c @@ -10,7 +10,7 @@ #include #include "frontend/emulator/jniHelper.h" -#include "sjme/boot.h" +#include "sjme/nvm/boot.h" #include "sjme/alloc.h" void SJME_JNI_METHOD(SJME_CLASS_NVM_BOOT_PARAM, _1_1setMainArgs) diff --git a/nanocoat/frontend/emulator/nativeNvmState.c b/nanocoat/frontend/emulator/nativeNvmState.c index 549dbfa361..87e795a77f 100644 --- a/nanocoat/frontend/emulator/nativeNvmState.c +++ b/nanocoat/frontend/emulator/nativeNvmState.c @@ -10,7 +10,7 @@ #include #include "frontend/emulator/jniHelper.h" -#include "sjme/boot.h" +#include "sjme/nvm/boot.h" jlong SJME_JNI_METHOD(SJME_CLASS_NVM_STATE, _1_1nvmBoot) (JNIEnv* env, jclass classy, jlong poolPtr, jlong reservedPtr, diff --git a/nanocoat/frontend/emulator/nativeVirtualLibrary.c b/nanocoat/frontend/emulator/nativeVirtualLibrary.c index 37d4113b52..e47a1d81a1 100644 --- a/nanocoat/frontend/emulator/nativeVirtualLibrary.c +++ b/nanocoat/frontend/emulator/nativeVirtualLibrary.c @@ -14,7 +14,7 @@ #include "frontend/emulator/jniHelper.h" #include "sjme/alloc.h" #include "sjme/debug.h" -#include "sjme/rom.h" +#include "sjme/nvm/rom.h" sjme_errorCode sjme_jni_virtualLibrary_init( sjme_attrInNotNull sjme_rom_library inLibrary, diff --git a/nanocoat/frontend/emulator/nativeVirtualSuite.c b/nanocoat/frontend/emulator/nativeVirtualSuite.c index 930ce2f4d6..a3f59abe99 100644 --- a/nanocoat/frontend/emulator/nativeVirtualSuite.c +++ b/nanocoat/frontend/emulator/nativeVirtualSuite.c @@ -14,7 +14,7 @@ #include "frontend/emulator/jniHelper.h" #include "sjme/alloc.h" #include "sjme/debug.h" -#include "sjme/rom.h" +#include "sjme/nvm/rom.h" static sjme_errorCode sjme_jni_virtualSuite_init( sjme_attrInNotNull sjme_rom_suite inSuite, diff --git a/nanocoat/frontend/libjvm/vmInit.c b/nanocoat/frontend/libjvm/vmInit.c index 04b9c79502..f11881c9f2 100644 --- a/nanocoat/frontend/libjvm/vmInit.c +++ b/nanocoat/frontend/libjvm/vmInit.c @@ -10,7 +10,7 @@ #include #include "sjme/alloc.h" -#include "sjme/boot.h" +#include "sjme/nvm/boot.h" #include "sjme/debug.h" /** Default amount of memory. */ diff --git a/nanocoat/tests/testDescBinaryName.c b/nanocoat/tests/testDescBinaryName.c index 7233331b9c..892c042cc8 100644 --- a/nanocoat/tests/testDescBinaryName.c +++ b/nanocoat/tests/testDescBinaryName.c @@ -7,7 +7,7 @@ // See license.mkd for licensing and copyright information. // -------------------------------------------------------------------------*/ -#include "sjme/descriptor.h" +#include "sjme/nvm/descriptor.h" #include #include "mock.h" diff --git a/nanocoat/tests/testDescClassName.c b/nanocoat/tests/testDescClassName.c index 0d20b1631d..7399507609 100644 --- a/nanocoat/tests/testDescClassName.c +++ b/nanocoat/tests/testDescClassName.c @@ -7,7 +7,7 @@ // See license.mkd for licensing and copyright information. // -------------------------------------------------------------------------*/ -#include "sjme/descriptor.h" +#include "sjme/nvm/descriptor.h" #include #include diff --git a/nanocoat/tests/testDescFieldType.c b/nanocoat/tests/testDescFieldType.c index 56348f3adc..eac0b03dec 100644 --- a/nanocoat/tests/testDescFieldType.c +++ b/nanocoat/tests/testDescFieldType.c @@ -14,7 +14,7 @@ #include "sjme/util.h" #include "test.h" #include "unit.h" -#include "sjme/descriptor.h" +#include "sjme/nvm/descriptor.h" /** The max permitted array size. */ #define MAX_ARRAY 8 diff --git a/nanocoat/tests/testDescIdentifier.c b/nanocoat/tests/testDescIdentifier.c index dc2d8c5752..d371abe208 100644 --- a/nanocoat/tests/testDescIdentifier.c +++ b/nanocoat/tests/testDescIdentifier.c @@ -7,7 +7,7 @@ // See license.mkd for licensing and copyright information. // -------------------------------------------------------------------------*/ -#include "sjme/descriptor.h" +#include "sjme/nvm/descriptor.h" #include #include "mock.h" diff --git a/nanocoat/tests/testDescMethodType.c b/nanocoat/tests/testDescMethodType.c index fb63a0b543..8ed1bb220a 100644 --- a/nanocoat/tests/testDescMethodType.c +++ b/nanocoat/tests/testDescMethodType.c @@ -14,7 +14,7 @@ #include "sjme/util.h" #include "test.h" #include "unit.h" -#include "sjme/descriptor.h" +#include "sjme/nvm/descriptor.h" /** * What to test and the expected values for method descriptors. diff --git a/nanocoat/tests/testNvmLocalPopDouble.c b/nanocoat/tests/testNvmLocalPopDouble.c index d72f8d302a..98b4b7015c 100755 --- a/nanocoat/tests/testNvmLocalPopDouble.c +++ b/nanocoat/tests/testNvmLocalPopDouble.c @@ -11,7 +11,7 @@ #include "mock.h" #include "proto.h" -#include "sjme/nvmFunc.h" +#include "sjme/nvm/nvmFunc.h" #include "test.h" #include "unit.h" diff --git a/nanocoat/tests/testNvmLocalPopFloat.c b/nanocoat/tests/testNvmLocalPopFloat.c index 91edaafcc4..7cf04fe884 100755 --- a/nanocoat/tests/testNvmLocalPopFloat.c +++ b/nanocoat/tests/testNvmLocalPopFloat.c @@ -11,7 +11,7 @@ #include "mock.h" #include "proto.h" -#include "sjme/nvmFunc.h" +#include "sjme/nvm/nvmFunc.h" #include "test.h" #include "unit.h" diff --git a/nanocoat/tests/testNvmLocalPopInteger.c b/nanocoat/tests/testNvmLocalPopInteger.c index db14f14ec9..a812db7669 100755 --- a/nanocoat/tests/testNvmLocalPopInteger.c +++ b/nanocoat/tests/testNvmLocalPopInteger.c @@ -11,7 +11,7 @@ #include "mock.h" #include "proto.h" -#include "sjme/nvmFunc.h" +#include "sjme/nvm/nvmFunc.h" #include "test.h" #include "unit.h" diff --git a/nanocoat/tests/testNvmLocalPopLong.c b/nanocoat/tests/testNvmLocalPopLong.c index 479364d10e..16faa3d4a1 100755 --- a/nanocoat/tests/testNvmLocalPopLong.c +++ b/nanocoat/tests/testNvmLocalPopLong.c @@ -11,7 +11,7 @@ #include "mock.h" #include "proto.h" -#include "sjme/nvmFunc.h" +#include "sjme/nvm/nvmFunc.h" #include "test.h" #include "unit.h" diff --git a/nanocoat/tests/testNvmLocalPopReference.c b/nanocoat/tests/testNvmLocalPopReference.c index 0754de340f..88d8743f14 100755 --- a/nanocoat/tests/testNvmLocalPopReference.c +++ b/nanocoat/tests/testNvmLocalPopReference.c @@ -12,7 +12,7 @@ #include "mock.h" #include "proto.h" #include "sjme/debug.h" -#include "sjme/nvmFunc.h" +#include "sjme/nvm/nvmFunc.h" #include "test.h" #include "unit.h" diff --git a/nanocoat/tests/testRomSuiteClassPathById.c b/nanocoat/tests/testRomSuiteClassPathById.c index 3a80245211..54f858629f 100644 --- a/nanocoat/tests/testRomSuiteClassPathById.c +++ b/nanocoat/tests/testRomSuiteClassPathById.c @@ -11,7 +11,7 @@ #include "mock.h" #include "proto.h" -#include "sjme/romInternal.h" +#include "sjme/nvm/romInternal.h" #include "test.h" #include "unit.h" diff --git a/nanocoat/tests/testRomSuiteClassPathByName.c b/nanocoat/tests/testRomSuiteClassPathByName.c index 134b74dc95..88741dcbe3 100644 --- a/nanocoat/tests/testRomSuiteClassPathByName.c +++ b/nanocoat/tests/testRomSuiteClassPathByName.c @@ -11,7 +11,7 @@ #include "mock.h" #include "proto.h" -#include "sjme/romInternal.h" +#include "sjme/nvm/romInternal.h" #include "test.h" #include "unit.h" diff --git a/nanocoat/tests/testRomSuiteLibraries.c b/nanocoat/tests/testRomSuiteLibraries.c index d306498576..6aadf04505 100644 --- a/nanocoat/tests/testRomSuiteLibraries.c +++ b/nanocoat/tests/testRomSuiteLibraries.c @@ -11,7 +11,7 @@ #include "mock.h" #include "proto.h" -#include "sjme/romInternal.h" +#include "sjme/nvm/romInternal.h" #include "test.h" #include "unit.h" diff --git a/nanocoat/tests/testTaskSpawn.c b/nanocoat/tests/testTaskSpawn.c index 1bee2b63e4..4e782f14a1 100644 --- a/nanocoat/tests/testTaskSpawn.c +++ b/nanocoat/tests/testTaskSpawn.c @@ -11,7 +11,7 @@ #include "mock.h" #include "proto.h" -#include "sjme/task.h" +#include "sjme/nvm/task.h" #include "test.h" #include "unit.h" -- 2.11.4.GIT