stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 12:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename HAVE_STRLCPY to SRB2_HAVE_STRLCPY, fix non-glibc compile

Browse source 
- Fix compile with msvcrt
- Fix compile with SDL 2.28.2
This commit is contained in:
James R 2023-08-06 19:34:50 -07:00 committed by Sal
parent f0b09dec6b
commit 909e07be65
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/doomtype.h
View file

@ -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
#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

2
src/string.c
View file

@ -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.