From 357b7d68f6a5c38710bdf1b5d3973adb4aff0fee Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 28 Dec 2020 19:55:54 +0100 Subject: [PATCH] (libretro-common) Rename rhash to lrc_hash (rcheevos) Rename rhash to rc_hash --- Makefile.common | 2 +- cheevos/cheevos.c | 4 ++-- deps/rcheevos/include/{rhash.h => rc_hash.h} | 0 deps/rcheevos/src/rhash/hash.c | 5 ++--- deps/rcheevos/src/rhash/md5.h | 2 +- gfx/video_shader_parse.c | 2 +- griffin/griffin.c | 2 +- libretro-common/hash/{rhash.c => lrc_hash.c} | 4 ++-- libretro-common/include/{rhash.h => lrc_hash.h} | 2 +- libretro-common/samples/utils/md5_test.c | 2 +- libretro-common/samples/utils/sha1_main.c | 2 +- libretro-common/utils/md5.c | 2 +- libretro-db/c_converter.c | 2 +- msg_hash.c | 2 +- network/netplay/netplay_handshake.c | 2 +- pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj | 4 ++-- tasks/task_netplay_find_content.c | 2 +- tasks/task_overlay.c | 2 +- 18 files changed, 21 insertions(+), 22 deletions(-) rename deps/rcheevos/include/{rhash.h => rc_hash.h} (100%) rename libretro-common/hash/{rhash.c => lrc_hash.c} (99%) rename libretro-common/include/{rhash.h => lrc_hash.h} (97%) diff --git a/Makefile.common b/Makefile.common index f4c5dca39a..46432ff48c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -257,7 +257,7 @@ OBJ += \ $(LIBRETRO_COMM_DIR)/file/file_path.o \ $(LIBRETRO_COMM_DIR)/file/file_path_io.o \ file_path_special.o \ - $(LIBRETRO_COMM_DIR)/hash/rhash.o \ + $(LIBRETRO_COMM_DIR)/hash/lrc_hash.o \ input/common/input_hid_common.o \ led/led_driver.o \ gfx/video_coord_array.o \ diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c index 34cd4637c6..e5f2826a49 100644 --- a/cheevos/cheevos.c +++ b/cheevos/cheevos.c @@ -74,7 +74,7 @@ #include "../deps/rcheevos/include/rcheevos.h" #include "../deps/rcheevos/include/rurl.h" -#include "../deps/rcheevos/include/rhash.h" +#include "../deps/rcheevos/include/rc_hash.h" /* Define this macro to prevent cheevos from being deactivated. */ #undef CHEEVOS_DONT_DEACTIVATE @@ -2569,7 +2569,7 @@ static void rcheevos_task_handler(retro_task_t *task) } } -/* hooks for rhash library */ +/* hooks for rc_hash library */ static void* rc_hash_handle_file_open(const char* path) { diff --git a/deps/rcheevos/include/rhash.h b/deps/rcheevos/include/rc_hash.h similarity index 100% rename from deps/rcheevos/include/rhash.h rename to deps/rcheevos/include/rc_hash.h diff --git a/deps/rcheevos/src/rhash/hash.c b/deps/rcheevos/src/rhash/hash.c index 57fa26825e..bf54166a2c 100644 --- a/deps/rcheevos/src/rhash/hash.c +++ b/deps/rcheevos/src/rhash/hash.c @@ -1,8 +1,7 @@ #ifdef RARCH_INTERNAL - /* explicit path to avoid conflict with libretro-common/include/rhash.h */ - #include "../../include/rhash.h" + #include "../../include/rc_hash.h" #else - #include "rhash.h" + #include "rc_hash.h" #endif #include "../rcheevos/compat.h" diff --git a/deps/rcheevos/src/rhash/md5.h b/deps/rcheevos/src/rhash/md5.h index 8f100b176b..f39045e9ab 100644 --- a/deps/rcheevos/src/rhash/md5.h +++ b/deps/rcheevos/src/rhash/md5.h @@ -7,7 +7,7 @@ /* android build has libretro-common/include in path, but not the base directory. * other builds prioritize rcheevos/include over libretro-common/include. * to ensure we get the correct include file, use a complicated relative path */ -#include <../../../libretro-common/include/rhash.h> +#include #define md5_state_t MD5_CTX #define md5_byte_t unsigned char diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c index 11159f61a4..40581d3c79 100644 --- a/gfx/video_shader_parse.c +++ b/gfx/video_shader_parse.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/griffin/griffin.c b/griffin/griffin.c index 8f2594e00b..884cd87ece 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -225,7 +225,7 @@ CHEATS #ifdef HAVE_CHEATS #include "../cheat_manager.c" #endif -#include "../libretro-common/hash/rhash.c" +#include "../libretro-common/hash/lrc_hash.c" /*============================================================ UI COMMON CONTEXT diff --git a/libretro-common/hash/rhash.c b/libretro-common/hash/lrc_hash.c similarity index 99% rename from libretro-common/hash/rhash.c rename to libretro-common/hash/lrc_hash.c index 05e46c5fc8..98ce132823 100644 --- a/libretro-common/hash/rhash.c +++ b/libretro-common/hash/lrc_hash.c @@ -1,7 +1,7 @@ /* Copyright (C) 2010-2020 The RetroArch team * * --------------------------------------------------------------------------------------- - * The following license statement only applies to this file (rhash.c). + * The following license statement only applies to this file (lrc_hash.c). * --------------------------------------------------------------------------------------- * * Permission is hereby granted, free of charge, @@ -27,7 +27,7 @@ #else #include #endif -#include +#include #include #include #include diff --git a/libretro-common/include/rhash.h b/libretro-common/include/lrc_hash.h similarity index 97% rename from libretro-common/include/rhash.h rename to libretro-common/include/lrc_hash.h index 4396d809f4..581c6d7cca 100644 --- a/libretro-common/include/rhash.h +++ b/libretro-common/include/lrc_hash.h @@ -1,7 +1,7 @@ /* Copyright (C) 2010-2020 The RetroArch team * * --------------------------------------------------------------------------------------- - * The following license statement only applies to this file (rhash.h). + * The following license statement only applies to this file (lrc_hash.h). * --------------------------------------------------------------------------------------- * * Permission is hereby granted, free of charge, diff --git a/libretro-common/samples/utils/md5_test.c b/libretro-common/samples/utils/md5_test.c index 55813c7fb2..3081f57935 100644 --- a/libretro-common/samples/utils/md5_test.c +++ b/libretro-common/samples/utils/md5_test.c @@ -37,7 +37,7 @@ #include #include -#include +#include int main (int argc, char *argv[]) { diff --git a/libretro-common/samples/utils/sha1_main.c b/libretro-common/samples/utils/sha1_main.c index ba9c58da62..58745fac9a 100644 --- a/libretro-common/samples/utils/sha1_main.c +++ b/libretro-common/samples/utils/sha1_main.c @@ -19,7 +19,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #endif #include diff --git a/libretro-common/utils/md5.c b/libretro-common/utils/md5.c index 1d16e034fa..5deb03ce5b 100644 --- a/libretro-common/utils/md5.c +++ b/libretro-common/utils/md5.c @@ -34,7 +34,7 @@ * optimizations are not included to reduce source code size and avoid * compile-time configuration. */ -#include +#include #include diff --git a/libretro-db/c_converter.c b/libretro-db/c_converter.c index fbaf52c5c9..1ea96cbc45 100644 --- a/libretro-db/c_converter.c +++ b/libretro-db/c_converter.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/msg_hash.c b/msg_hash.c index 6da2d17b75..72875c7222 100644 --- a/msg_hash.c +++ b/msg_hash.c @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/network/netplay/netplay_handshake.c b/network/netplay/netplay_handshake.c index 620fb7ac2b..e70b9ab572 100644 --- a/network/netplay/netplay_handshake.c +++ b/network/netplay/netplay_handshake.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "netplay_private.h" diff --git a/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj index d77b11907e..70598ca580 100644 --- a/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj @@ -214,7 +214,7 @@ 92B9EBD324E0518700E6CFB2 /* float_to_s16.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = float_to_s16.h; sourceTree = ""; }; 92B9EBD424E0518700E6CFB2 /* audio_mix.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = audio_mix.h; sourceTree = ""; }; 92B9EBD524E0518700E6CFB2 /* memmap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = memmap.h; sourceTree = ""; }; - 92B9EBD624E0518700E6CFB2 /* rhash.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rhash.h; sourceTree = ""; }; + 92B9EBD624E0518700E6CFB2 /* lrc_hash.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = lrc_hash.h; sourceTree = ""; }; 92B9EBD824E0518700E6CFB2 /* tpool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = tpool.h; sourceTree = ""; }; 92B9EBD924E0518700E6CFB2 /* rthreads.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rthreads.h; sourceTree = ""; }; 92B9EBDA24E0518700E6CFB2 /* async_job.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = async_job.h; sourceTree = ""; }; @@ -468,7 +468,7 @@ 92B9EBAA24E0518700E6CFB2 /* retro_math.h */, 92B9EBC324E0518700E6CFB2 /* retro_miscellaneous.h */, 92B9EB8124E0518700E6CFB2 /* retro_timers.h */, - 92B9EBD624E0518700E6CFB2 /* rhash.h */, + 92B9EBD624E0518700E6CFB2 /* lrc_hash.h */, 92B9EBD724E0518700E6CFB2 /* rthreads */, 92B9EBAB24E0518700E6CFB2 /* streams */, 92B9EBE424E0518700E6CFB2 /* string */, diff --git a/tasks/task_netplay_find_content.c b/tasks/task_netplay_find_content.c index a272c03f80..970a8e5db8 100644 --- a/tasks/task_netplay_find_content.c +++ b/tasks/task_netplay_find_content.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c index bef737e354..b98804e93c 100644 --- a/tasks/task_overlay.c +++ b/tasks/task_overlay.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "tasks_internal.h"