From 8926a4b077d61e4b2bf8acc40d61169b9114f3ff Mon Sep 17 00:00:00 2001 From: Andre Leiradella Date: Tue, 30 Aug 2016 23:27:47 +0100 Subject: [PATCH] fixed header for md5 funcs and md5.c inclusion in griffin --- griffin/griffin.c | 8 +++++++- httpserver/civetweb.c | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/griffin/griffin.c b/griffin/griffin.c index 9a42beae95..294037a2cc 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -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 ============================================================ */ diff --git a/httpserver/civetweb.c b/httpserver/civetweb.c index 8e41902bf0..b4653e78d3 100644 --- a/httpserver/civetweb.c +++ b/httpserver/civetweb.c @@ -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 /* Darwin prior to 7.0 and Win32 do not have socklen_t */ #ifdef NO_SOCKLEN_T