1 files changed, 9 insertions, 11 deletions

diff --git a/src/internal/ntux_nolibc_impl.c b/src/internal/ntux_nolibc_impl.c
index c027fe9..b5a016b 100644
--- a/src/internal/ntux_nolibc_impl.c
+++ b/src/internal/ntux_nolibc_impl.c
@@ -4,40 +4,38 @@
 /*  Released under GPLv2 and GPLv3; see COPYING.NTUX.      */
 /***********************************************************/
 
-#include <ntapi/ntapi.h>
-
-extern const ntapi_vtbl * ntux_ntapi;
+#include <psxxfi/xfi_base.h>
 
 void * ntux_memcpy(void * dst, const void * src, size_t n)
 {
-	return ntux_ntapi->tt_generic_memcpy(dst,src,n);
+	return __xfi_memcpy(dst,src,n);
 }
 
 void * ntux_memset(void * ch, int c, size_t n)
 {
-	return ntux_ntapi->tt_generic_memset(ch,c,n);
+	return __xfi_memset(ch,c,n);
 }
 
 char * ntux_strcpy(char * dst, const char * src)
 {
-	return ntux_ntapi->tt_generic_memcpy(
+	return __xfi_memcpy(
 		dst,src,
-		ntux_ntapi->tt_string_null_offset_multibyte(src));
+		__xfi_strlen(src));
 }
 
 size_t ntux_strlen(const char * ch)
 {
-	return ntux_ntapi->tt_string_null_offset_multibyte(ch);
+	return __xfi_strlen(ch);
 }
 
 int ntux_strcmp(const char * a, const char * b)
 {
-	return ntux_ntapi->tt_strcmp_multibyte(a,b);
+	return __xfi_strcmp(a,b);
 }
 
 int ntux_strncmp(const char * a, const char * b, size_t n)
 {
-	return ntux_ntapi->tt_strncmp_multibyte(a,b,n);
+	return __xfi_strncmp(a,b,n);
 }
 
 char * ntux_strchr(const char * ch, int c)
@@ -53,7 +51,7 @@ char * ntux_strrchr(const char * ch, int c)
 	const char * base;
 
 	base = ch;
-	ch  += ntux_ntapi->tt_string_null_offset_multibyte(ch);
+	ch  += __xfi_strlen(ch);
 
 	for (; ch >= base; ch--)
 		if (*ch == c)