From d0b480f3c537cc23570885bdfdbcfcf819938f10 Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Thu, 17 Jul 2025 14:02:00 +0200 Subject: [PATCH] Renaming basename function to bx_basename should fix compilation issues. Upstream-Status: Backport [commit 2c4053709bbf] Signed-off-by: Ismael Luceno --- bochs/gui/keymap.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gui/keymap.cc b/gui/keymap.cc index 3426b6b5694e..630f79d6820b 100644 --- a/gui/keymap.cc +++ b/gui/keymap.cc @@ -96,8 +96,7 @@ bx_keymap_c::~bx_keymap_c(void) keymapCount = 0; } -#if defined(WIN32) || defined(__ANDROID__) -char* basename(char *path) +static char* bx_basename(char *path) { char *ptr; @@ -114,7 +113,6 @@ char* basename(char *path) } return ptr; } -#endif void bx_keymap_c::loadKeymap(const char *prefix, Bit32u stringToSymbol(const char*)) { @@ -130,7 +128,7 @@ void bx_keymap_c::loadKeymap(const char *prefix, Bit32u stringToSymbol(const cha } else { char *prefix2 = new char[strlen(prefix + 2)]; sprintf(prefix2, "%s-", prefix); - if (strncmp(prefix2, basename(keymap_file), strlen(prefix2))) { + if (strncmp(prefix2, bx_basename(keymap_file), strlen(prefix2))) { BX_PANIC(("Keymap file not designed for this display library")); } delete [] prefix2;