From e73280782ce1e0ca825272715a908cff55f9fa0a Mon Sep 17 00:00:00 2001 From: Josep Torra Date: Fri, 22 Mar 2019 22:25:20 +0100 Subject: [PATCH] closedcaption: fix build error in OSX Fixes the following error by commenting an unused block. ./misc.h:503:11: error: 'strlcpy' macro redefined [-Werror,-Wmacro-redefined] --- ext/closedcaption/misc.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/closedcaption/misc.h b/ext/closedcaption/misc.h index 6003105..687b454 100644 --- a/ext/closedcaption/misc.h +++ b/ext/closedcaption/misc.h @@ -15,8 +15,8 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. */ @@ -498,6 +498,7 @@ _vbi_time_max (void) # define __va_copy(ap1, ap2) do { ap1 = ap2; } while (0) #endif +#if 0 /* Use this instead of strncpy(). strlcpy() is a BSD extension. */ #ifndef HAVE_STRLCPY # define strlcpy _vbi_strlcpy @@ -510,6 +511,7 @@ _vbi_strlcpy (char * dst, const char * src, size_t size) _vbi_nonnull ((1, 2)); +#endif /* /\* strndup() is a BSD/GNU extension. *\/ */ /* #ifndef HAVE_STRNDUP */ -- 2.7.4