From 21af918cba8fb6ac7ad661392a6c305a07239e93 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 10 Mar 2015 18:47:21 +0100 Subject: [PATCH] Add ifndef conditionals around strlcat / strlcpy definitions in srl.h --- libretro-common/include/compat/strl.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libretro-common/include/compat/strl.h b/libretro-common/include/compat/strl.h index 07ad63bf0c..6a169bfab5 100644 --- a/libretro-common/include/compat/strl.h +++ b/libretro-common/include/compat/strl.h @@ -37,11 +37,17 @@ extern "C" { #endif /* Avoid possible naming collisions during link since * we prefer to use the actual name. */ +#ifndef strlcpy #define strlcpy(dst, src, size) strlcpy_rarch__(dst, src, size) +#endif + +#ifndef strlcat #define strlcat(dst, src, size) strlcat_rarch__(dst, src, size) +#endif size_t strlcpy(char *dest, const char *source, size_t size); size_t strlcat(char *dest, const char *source, size_t size); + #ifdef __cplusplus } #endif