build: more mac fixes
This commit is contained in:
parent
2165c68066
commit
18f51b343b
|
@ -4,7 +4,9 @@ dist: trusty
|
||||||
|
|
||||||
os:
|
os:
|
||||||
- linux
|
- linux
|
||||||
|
env: CFLAGS=-Wno-absolute-value -Werror
|
||||||
- osx
|
- osx
|
||||||
|
env: CFLAGS=--Werror
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- CFLAGS=-Wno-absolute-value -Wno-unknown-warning-option -Werror
|
- CFLAGS=-Wno-absolute-value -Wno-unknown-warning-option -Werror
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#else
|
#else
|
||||||
#ifndef HAVE_MEMCPY
|
#ifndef HAVE_MEMCPY
|
||||||
#if !((defined (_WIN32) || defined (_WIN32_WCE)) && !defined (__CYGWIN__))
|
#if !((defined (_WIN32) || defined (_WIN32_WCE)) && !defined (__CYGWIN__)) && !defined (__APPLE__)
|
||||||
#define memcpy(d, s, n) bcopy ((s), (d), (n))
|
#define memcpy(d, s, n) bcopy ((s), (d), (n))
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "doomdef.h"
|
#include "doomdef.h"
|
||||||
|
|
||||||
|
#if !defined (__APPLE__)
|
||||||
|
|
||||||
// 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.
|
||||||
size_t strlcat(char *dst, const char *src, size_t siz)
|
size_t strlcat(char *dst, const char *src, size_t siz)
|
||||||
|
@ -46,3 +48,5 @@ size_t strlcpy(char *dst, const char *src, size_t siz)
|
||||||
dst[0] = '\0';
|
dst[0] = '\0';
|
||||||
return strlcat(dst, src, siz);
|
return strlcat(dst, src, siz);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue