diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-12 23:12:23 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-13 19:57:58 +0300 |
| commit | 3bd926eeef1346c8ed052883ecd2d3828c58e6d5 (patch) | |
| tree | 263798094fe0e61e1617ee1b5b053cf87bbe173f | |
| parent | bf57f81bece64052f1fb232beac2b3f842d4a0d2 (diff) | |
If we have strlcat(), we have strlcat(), no need to declare it
The system strlcat() might be some clever built-in or macro thing
anyway, and having a bogus duplicate declaration can cause
problems. And does, in the iOS 7 SDK.
Change-Id: I0aed0ad0f7b96c1c887ed928a2c07fc99bd703f7
| -rw-r--r-- | curl/UnpackedTarball_curl.mk | 1 | ||||
| -rw-r--r-- | curl/curl-7.26.0_strlcat.patch | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/curl/UnpackedTarball_curl.mk b/curl/UnpackedTarball_curl.mk index 70ac67090c7f..f90007f60f0f 100644 --- a/curl/UnpackedTarball_curl.mk +++ b/curl/UnpackedTarball_curl.mk @@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\ curl/curl-7.26.0_win.patch \ curl/curl-7.26.0_mingw.patch \ curl/curl-7.26.0_win-proxy.patch \ + curl/curl-7.26.0_strlcat.patch \ )) ifeq ($(OS),ANDROID) $(eval $(call gb_UnpackedTarball_add_patches,curl,\ diff --git a/curl/curl-7.26.0_strlcat.patch b/curl/curl-7.26.0_strlcat.patch new file mode 100644 index 000000000000..c5536f822641 --- /dev/null +++ b/curl/curl-7.26.0_strlcat.patch @@ -0,0 +1,9 @@ +--- curl-7.26.0/lib/strequal.h ++++ misc/build/curl-7.26.0/strequal.h +@@ -30,6 +30,5 @@ + #ifndef HAVE_STRLCAT + #define strlcat(x,y,z) Curl_strlcat(x,y,z) + #endif +-size_t strlcat(char *dst, const char *src, size_t siz); + + #endif |