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 /strlcpy.c | |
| 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))
Diffstat (limited to 'strlcpy.c')
| -rw-r--r-- | strlcpy.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 |