From 84199e80fb52fd21363bdb5cde408862fcf66eee Mon Sep 17 00:00:00 2001 From: Kim Holviala Date: Mon, 10 Nov 2014 11:15:55 +0200 Subject: [PATCH] Fix compiling for MacOS X Yosemite --- Makefile | 5 ++++- gophernicus.h | 12 +++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2eaa04d..de5298d 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,10 @@ headers: $(HEADERS) functions.h: echo "/* Automatically generated function definitions */" > $@ echo >> $@ - grep -h "^[a-z]" $(SOURCES) | grep -v "int main" | sed -e "s/ =.*$$//" -e "s/ *$$/;/" >> $@ + grep -h "^[a-z]" $(SOURCES) | \ + grep -v "int main" | \ + grep -v "strlc" | \ + sed -e "s/ =.*$$//" -e "s/ *$$/;/" >> $@ @echo bin2c: bin2c.c diff --git a/gophernicus.h b/gophernicus.h index e5f10e9..2e1a8e9 100644 --- a/gophernicus.h +++ b/gophernicus.h @@ -58,7 +58,6 @@ /* Embedded Linux with uClibc */ #ifdef __UCLIBC__ -lskdjf #undef HAVE_SHMEM #undef HAVE_PASSWD #endif @@ -74,6 +73,13 @@ lskdjf #define HAVE_STRLCPY #endif +/* MacOS */ +#if defined(__APPLE__) +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_10 +#define HAVE_STRLCPY +#endif +#endif + /* Add other OS-specific defines here */ /* @@ -119,6 +125,10 @@ lskdjf #include #endif +#if !defined(HAVE_STRLCPY) +size_t strlcpy(char *dst, const char *src, size_t siz); +size_t strlcat(char *dst, const char *src, size_t siz); +#endif /* * Compile-time configuration