diff options
author | Christian Neukirchen <chneukirchen@gmail.com> | 2014-06-22 22:50:03 +0200 |
---|---|---|
committer | Christian Neukirchen <chneukirchen@gmail.com> | 2014-06-22 22:50:03 +0200 |
commit | c7f481e6fac2cb693144bff45f6180d146bf13a5 (patch) | |
tree | 2a5c04fce3a24a471a0d0dbe8e93f82af0fa98a4 | |
parent | a483e23e944def41b6fac57297d7203309b8f0ec (diff) | |
download | cwm-c7f481e6fac2cb693144bff45f6180d146bf13a5.tar.gz cwm-c7f481e6fac2cb693144bff45f6180d146bf13a5.tar.xz cwm-c7f481e6fac2cb693144bff45f6180d146bf13a5.zip |
Don't use included strlcpy/strlcat when already defined as macros
OS X 10.9 with Fortify has conflicting prototypes: In file included from calmwm.c:36: ./calmwm.h:28:8: error: conflicting types for '__builtin___strlcat_chk' /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/secure/_string.h:111:3: note: expanded from macro 'strlcat' __builtin___strlcat_chk (dest, src, len, __darwin_obsz (dest))
-rw-r--r-- | calmwm.h | 15 | ||||
-rw-r--r-- | strlcat.c | 5 | ||||
-rw-r--r-- | strlcpy.c | 5 |
3 files changed, 20 insertions, 5 deletions
diff --git a/calmwm.h b/calmwm.h index c2e0b90..e5fa2c8 100644 --- a/calmwm.h +++ b/calmwm.h @@ -21,11 +21,24 @@ #ifndef _CALMWM_H_ #define _CALMWM_H_ +#include <sys/param.h> +#include <stdio.h> +#include "queue.h" + /* prototypes for portable-included functions */ char *fgetln(FILE *, size_t *); long long strtonum(const char *, long long, long long, const char **); -size_t strlcpy(char *, const char *, size_t); + +#ifdef strlcat +#define HAVE_STRLCAT +#else size_t strlcat(char *, const char *, size_t); +#endif +#ifdef strlcpy +#define HAVE_STRLCPY +#else +size_t strlcpy(char *, const char *, size_t); +#endif #include <X11/XKBlib.h> #include <X11/Xatom.h> diff --git a/strlcat.c b/strlcat.c index 3702ead..6e28e87 100644 --- a/strlcat.c +++ b/strlcat.c @@ -18,10 +18,11 @@ /* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */ -#ifndef HAVE_STRLCAT - #include <sys/types.h> #include <string.h> +#include "calmwm.h" + +#ifndef HAVE_STRLCAT /* * Appends src to string dst of size siz (unlike strncat, siz is the diff --git a/strlcpy.c b/strlcpy.c index 9fef621..30a260c 100644 --- a/strlcpy.c +++ b/strlcpy.c @@ -18,10 +18,11 @@ /* OPENBSD ORIGINAL: lib/libc/string/strlcpy.c */ -#ifndef HAVE_STRLCPY - #include <sys/types.h> #include <string.h> +#include "calmwm.h" + +#ifndef HAVE_STRLCPY /* * Copy src to string dst of size siz. At most siz-1 characters |