Skip to content
Snippets Groups Projects
Commit 909e07be authored by James R.'s avatar James R. Committed by Sal
Browse files

Rename HAVE_STRLCPY to SRB2_HAVE_STRLCPY, fix non-glibc compile

- Fix compile with msvcrt
- Fix compile with SDL 2.28.2
parent f0b09dec
No related branches found
No related tags found
No related merge requests found
...@@ -122,9 +122,13 @@ int endswith (const char *base, const char *tag); ...@@ -122,9 +122,13 @@ int endswith (const char *base, const char *tag);
#define HAVE_DOSSTR_FUNCS #define HAVE_DOSSTR_FUNCS
#endif #endif
// glibc 2.38: added strlcpy and strlcat to _DEFAULT_SOURCE #if defined (__APPLE__)
#if defined (__APPLE__) || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 38) #define SRB2_HAVE_STRLCPY
#define HAVE_STRLCPY #elif defined (__GLIBC_PREREQ)
// glibc 2.38: added strlcpy and strlcat to _DEFAULT_SOURCE
#if __GLIBC_PREREQ(2, 38)
#define SRB2_HAVE_STRLCPY
#endif
#endif #endif
#ifndef HAVE_DOSSTR_FUNCS #ifndef HAVE_DOSSTR_FUNCS
...@@ -134,7 +138,7 @@ int strlwr(char *n); // from dosstr.c ...@@ -134,7 +138,7 @@ int strlwr(char *n); // from dosstr.c
#include <stddef.h> // for size_t #include <stddef.h> // for size_t
#ifndef HAVE_STRLCPY #ifndef SRB2_HAVE_STRLCPY
size_t strlcat(char *dst, const char *src, size_t siz); size_t strlcat(char *dst, const char *src, size_t siz);
size_t strlcpy(char *dst, const char *src, size_t siz); size_t strlcpy(char *dst, const char *src, size_t siz);
#endif #endif
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <string.h> #include <string.h>
#include "doomdef.h" #include "doomdef.h"
#ifndef HAVE_STRLCPY #ifndef SRB2_HAVE_STRLCPY
// Like the OpenBSD version, but it doesn't check for src not being a valid // Like the OpenBSD version, but it doesn't check for src not being a valid
// C string. // C string.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment