From: Michael Lee Date: Fri, 15 Apr 2016 22:16:46 +0000 (-0700) Subject: Forgot to fix the guard for String.cpp X-Git-Tag: 2016.07.26~349 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=61aa1f461c6b764410d0bfe9de22d303ac184f0e;p=folly.git Forgot to fix the guard for String.cpp Summary:9ab69bc removed `__APPLE__` around the strndup definition because it is defined on modern OSX. But there was another reference in String.cpp. Fixing that. Reviewed By: yfeldblum Differential Revision: D3186360 fb-gh-sync-id: 709c3b93cd22945e2237412637929df1979526c1 fbshipit-source-id: 709c3b93cd22945e2237412637929df1979526c1 --- diff --git a/folly/portability/String.cpp b/folly/portability/String.cpp index 48ae5124..95a0e1d2 100755 --- a/folly/portability/String.cpp +++ b/folly/portability/String.cpp @@ -27,7 +27,7 @@ extern "C" void* memrchr(const void* s, int c, size_t n) { } #endif -#if defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__) +#if defined(_WIN32) || defined(__FreeBSD__) extern "C" char* strndup(const char* a, size_t len) { auto neededLen = strlen(a); if (neededLen > len) {