[x265] [PATCH 2 of 2] param: declare our custom strtok_r file-local to avoid multilib breakage

Steve Borho steve at borho.org
Wed Jun 24 17:41:00 CEST 2015


# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1435160175 18000
#      Wed Jun 24 10:36:15 2015 -0500
# Node ID b1af4c36f48a4500a4912373ebcda9a5540b5c15
# Parent  95df7ec3c5e6e4ccd1f58c93d302cdfd94ecddd8
param: declare our custom strtok_r file-local to avoid multilib breakage

diff -r 95df7ec3c5e6 -r b1af4c36f48a source/common/param.cpp
--- a/source/common/param.cpp	Wed Jun 24 10:31:02 2015 -0500
+++ b/source/common/param.cpp	Wed Jun 24 10:36:15 2015 -0500
@@ -52,7 +52,7 @@
  */
 
 #undef strtok_r
-char* strtok_r(char* str, const char* delim, char** nextp)
+static char* strtok_r(char* str, const char* delim, char** nextp)
 {
     if (!str)
         str = *nextp;


More information about the x265-devel mailing list