mirror of
https://github.com/libretro/RetroArch
synced 2025-03-28 19:20:35 +00:00
Merge pull request #3477 from leiradel/master
fixed header for md5 funcs and md5.c inclusion in griffin
This commit is contained in:
commit
9bd079f104
@ -119,11 +119,17 @@ ACHIEVEMENTS
|
||||
#endif
|
||||
|
||||
#include "../libretro-common/formats/json/jsonsax.c"
|
||||
#include "../libretro-common/utils/md5.c"
|
||||
#include "../network/net_http_special.c"
|
||||
#include "../cheevos.c"
|
||||
#endif
|
||||
|
||||
/*============================================================
|
||||
MD5
|
||||
============================================================ */
|
||||
#if (defined(HAVE_CHEEVOS) && defined(HAVE_THREADS)) || (defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB))
|
||||
#include "../libretro-common/utils/md5.c"
|
||||
#endif
|
||||
|
||||
/*============================================================
|
||||
CHEATS
|
||||
============================================================ */
|
||||
|
@ -807,8 +807,7 @@ static void mg_snprintf(const struct mg_connection *conn,
|
||||
/*#define vsnprintf DO_NOT_USE_THIS_FUNCTION__USE_mg_vsnprintf*/
|
||||
#endif
|
||||
|
||||
#define MD5_STATIC static
|
||||
#include "utils/md5.h"
|
||||
#include <rhash.h>
|
||||
|
||||
/* Darwin prior to 7.0 and Win32 do not have socklen_t */
|
||||
#ifdef NO_SOCKLEN_T
|
||||
|
@ -157,8 +157,6 @@ static int httpserver_handle_get_mmaps(struct mg_connection* conn, void* cbdata)
|
||||
|
||||
static int httpserver_handle_get_mmap(struct mg_connection* conn, void* cbdata)
|
||||
{
|
||||
static const char* hexdigits = "0123456789ABCDEF";
|
||||
|
||||
const struct mg_request_info* req = mg_get_request_info(conn);
|
||||
const char* comma = "";
|
||||
rarch_system_info_t* system;
|
||||
@ -214,8 +212,10 @@ static int httpserver_handle_get_mmap(struct mg_connection* conn, void* cbdata)
|
||||
mg_printf(conn,
|
||||
"{"
|
||||
"\"length\":" STRING_REP_UINT64 ","
|
||||
"\"compression\":\"deflate\","
|
||||
"\"compressedLength\":" STRING_REP_ULONG ","
|
||||
"\"bytesZ85\":\"%s\""
|
||||
"\"encoding\":\"Z85\","
|
||||
"\"data\":\"%s\""
|
||||
"}",
|
||||
mmap->len,
|
||||
(size_t)buflen,
|
||||
|
Loading…
x
Reference in New Issue
Block a user