From 70c25855f4ae5f9ab2dbd938c8d770b9a57adb9f Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 12 Mar 2025 08:26:19 -0400 Subject: [PATCH] kernel: Move convertutf to utils. No functional change. --- headers/private/{system => kernel/util}/convertutf.h | 0 src/add-ons/kernel/file_systems/exfat/DirectoryIterator.cpp | 2 +- src/add-ons/kernel/file_systems/exfat/Utility.cpp | 2 +- src/system/kernel/Jamfile | 1 - src/system/kernel/util/Jamfile | 1 + src/system/kernel/{ => util}/convertutf.cpp | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename headers/private/{system => kernel/util}/convertutf.h (100%) rename src/system/kernel/{ => util}/convertutf.cpp (99%) diff --git a/headers/private/system/convertutf.h b/headers/private/kernel/util/convertutf.h similarity index 100% rename from headers/private/system/convertutf.h rename to headers/private/kernel/util/convertutf.h diff --git a/src/add-ons/kernel/file_systems/exfat/DirectoryIterator.cpp b/src/add-ons/kernel/file_systems/exfat/DirectoryIterator.cpp index 24e81d1c53..cb97e5190f 100644 --- a/src/add-ons/kernel/file_systems/exfat/DirectoryIterator.cpp +++ b/src/add-ons/kernel/file_systems/exfat/DirectoryIterator.cpp @@ -14,7 +14,7 @@ #include -#include "convertutf.h" +#include #include "Inode.h" diff --git a/src/add-ons/kernel/file_systems/exfat/Utility.cpp b/src/add-ons/kernel/file_systems/exfat/Utility.cpp index 3694ff23d1..28c73aa268 100644 --- a/src/add-ons/kernel/file_systems/exfat/Utility.cpp +++ b/src/add-ons/kernel/file_systems/exfat/Utility.cpp @@ -18,7 +18,7 @@ #include -#include "convertutf.h" +#include status_t diff --git a/src/system/kernel/Jamfile b/src/system/kernel/Jamfile index e302d06bd1..b5b0761c32 100644 --- a/src/system/kernel/Jamfile +++ b/src/system/kernel/Jamfile @@ -28,7 +28,6 @@ KernelMergeObject kernel_core.o : boot_splash.cpp commpage.cpp condition_variable.cpp - convertutf.cpp cpu.cpp DPC.cpp elf.cpp diff --git a/src/system/kernel/util/Jamfile b/src/system/kernel/util/Jamfile index 5d709e1f87..b4fc495397 100644 --- a/src/system/kernel/util/Jamfile +++ b/src/system/kernel/util/Jamfile @@ -5,6 +5,7 @@ UsePrivateHeaders [ FDirName kernel util ] ; KernelMergeObject kernel_util.o : AVLTreeBase.cpp Bitmap.cpp + convertutf.cpp hostname.cpp inet_addr.c inet_ntop.c diff --git a/src/system/kernel/convertutf.cpp b/src/system/kernel/util/convertutf.cpp similarity index 99% rename from src/system/kernel/convertutf.cpp rename to src/system/kernel/util/convertutf.cpp index b1e27901a3..cbfe39d0fd 100644 --- a/src/system/kernel/convertutf.cpp +++ b/src/system/kernel/util/convertutf.cpp @@ -10,7 +10,7 @@ */ -#include "convertutf.h" +#include #include