mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3477 from leiradel/master

Browse Source 
fixed header for md5 funcs and md5.c inclusion in griffin
This commit is contained in:
Twinaphex 2016-08-31 02:49:43 +02:00 committed by GitHub
commit 9bd079f104
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
griffin/griffin.c
View File

@ -119,11 +119,17 @@ ACHIEVEMENTS
#endif #endif
#include "../libretro-common/formats/json/jsonsax.c" #include "../libretro-common/formats/json/jsonsax.c"
#include "../libretro-common/utils/md5.c"
#include "../network/net_http_special.c" #include "../network/net_http_special.c"
#include "../cheevos.c" #include "../cheevos.c"
#endif #endif
/*============================================================
MD5
============================================================ */
#if (defined(HAVE_CHEEVOS) && defined(HAVE_THREADS)) || (defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB))
#include "../libretro-common/utils/md5.c"
#endif
/*============================================================ /*============================================================
CHEATS CHEATS
============================================================ */ ============================================================ */

3
httpserver/civetweb.c
View File

@ -807,8 +807,7 @@ static void mg_snprintf(const struct mg_connection *conn,
/*#define vsnprintf DO_NOT_USE_THIS_FUNCTION__USE_mg_vsnprintf*/ /*#define vsnprintf DO_NOT_USE_THIS_FUNCTION__USE_mg_vsnprintf*/
#endif #endif
#define MD5_STATIC static #include <rhash.h>
#include "utils/md5.h"
/* Darwin prior to 7.0 and Win32 do not have socklen_t */ /* Darwin prior to 7.0 and Win32 do not have socklen_t */
#ifdef NO_SOCKLEN_T #ifdef NO_SOCKLEN_T

6
httpserver/httpserver.c
View File

@ -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 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 struct mg_request_info* req = mg_get_request_info(conn);
const char* comma = ""; const char* comma = "";
rarch_system_info_t* system; rarch_system_info_t* system;
@ -214,8 +212,10 @@ static int httpserver_handle_get_mmap(struct mg_connection* conn, void* cbdata)
mg_printf(conn, mg_printf(conn,
"{" "{"
"\"length\":" STRING_REP_UINT64 "," "\"length\":" STRING_REP_UINT64 ","
"\"compression\":\"deflate\","
"\"compressedLength\":" STRING_REP_ULONG "," "\"compressedLength\":" STRING_REP_ULONG ","
"\"bytesZ85\":\"%s\"" "\"encoding\":\"Z85\","
"\"data\":\"%s\""
"}", "}",
mmap->len, mmap->len,
(size_t)buflen, (size_t)buflen,