mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 07:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

(libretro-common) Rename rhash to lrc_hash

Browse Source 
(rcheevos) Rename rhash to rc_hash
This commit is contained in:
twinaphex 2020-12-28 19:55:54 +01:00
parent 71efd8ae6e
commit 357b7d68f6
18 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -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 \

4
cheevos/cheevos.c
View File

@ -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)
{

0
deps/rcheevos/include/rhash.h → deps/rcheevos/include/rc_hash.h vendored
View File

5
deps/rcheevos/src/rhash/hash.c vendored
View File

@ -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"

2
deps/rcheevos/src/rhash/md5.h vendored
View File

@ -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 <lrc_hash.h>
#define md5_state_t MD5_CTX
#define md5_byte_t unsigned char

2
gfx/video_shader_parse.c
View File

@ -26,7 +26,7 @@
#include <compat/msvc.h>
#include <compat/strl.h>
#include <file/file_path.h>
#include <rhash.h>
#include <lrc_hash.h>
#include <string/stdstring.h>
#include <streams/file_stream.h>
#include <lists/string_list.h>

2
griffin/griffin.c
View File

@ -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

4
libretro-common/hash/rhash.c → libretro-common/hash/lrc_hash.c
View File

@ -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 <unistd.h>
#endif
#include <rhash.h>
#include <lrc_hash.h>
#include <retro_miscellaneous.h>
#include <retro_endianness.h>
#include <streams/file_stream.h>

2
libretro-common/include/rhash.h → libretro-common/include/lrc_hash.h
View File

@ -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,

2
libretro-common/samples/utils/md5_test.c
View File

@ -37,7 +37,7 @@
#include <stdio.h>
#include <string.h>
#include <rhash.h>
#include <lrc_hash.h>
int main (int argc, char *argv[])
{

2
libretro-common/samples/utils/sha1_main.c
View File

@ -19,7 +19,7 @@
#include <stdio.h>
#include <string.h>
#ifdef WIN32
#ifdef _WIN32
#include <io.h>
#endif
#include <fcntl.h>

2
libretro-common/utils/md5.c
View File

@ -34,7 +34,7 @@
* optimizations are not included to reduce source code size and avoid
* compile-time configuration.
*/
#include <rhash.h>
#include <lrc_hash.h>
#include <string.h>

2
libretro-db/c_converter.c
View File

@ -28,7 +28,7 @@
#include <errno.h>
#include <string.h>
#include <stdlib.h>
#include <rhash.h>
#include <lrc_hash.h>
#include <retro_assert.h>
#include <string/stdstring.h>

2
msg_hash.c
View File

@ -17,7 +17,7 @@
#include <stdio.h>
#include <string.h>
#include <rhash.h>
#include <lrc_hash.h>
#include <string/stdstring.h>
#include <libretro.h>

2
network/netplay/netplay_handshake.c
View File

@ -22,7 +22,7 @@
#include <boolean.h>
#include <compat/strl.h>
#include <string/stdstring.h>
#include <rhash.h>
#include <lrc_hash.h>
#include <retro_timers.h>
#include "netplay_private.h"

4
pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj
View File

@ -214,7 +214,7 @@
92B9EBD324E0518700E6CFB2 /* float_to_s16.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = float_to_s16.h; sourceTree = "<group>"; };
92B9EBD424E0518700E6CFB2 /* audio_mix.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = audio_mix.h; sourceTree = "<group>"; };
92B9EBD524E0518700E6CFB2 /* memmap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = memmap.h; sourceTree = "<group>"; };
92B9EBD624E0518700E6CFB2 /* rhash.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rhash.h; sourceTree = "<group>"; };
92B9EBD624E0518700E6CFB2 /* lrc_hash.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = lrc_hash.h; sourceTree = "<group>"; };
92B9EBD824E0518700E6CFB2 /* tpool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = tpool.h; sourceTree = "<group>"; };
92B9EBD924E0518700E6CFB2 /* rthreads.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rthreads.h; sourceTree = "<group>"; };
92B9EBDA24E0518700E6CFB2 /* async_job.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = async_job.h; sourceTree = "<group>"; };
@ -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 */,

2
tasks/task_netplay_find_content.c
View File

@ -22,7 +22,7 @@
#include <retro_assert.h>
#include <retro_miscellaneous.h>
#include <lists/string_list.h>
#include <rhash.h>
#include <lrc_hash.h>
#include <string/stdstring.h>
#include <file/file_path.h>
#include <lists/dir_list.h>

2
tasks/task_overlay.c
View File

@ -23,7 +23,7 @@
#include <lists/string_list.h>
#include <streams/file_stream.h>
#include <string/stdstring.h>
#include <rhash.h>
#include <lrc_hash.h>
#include "tasks_internal.h"