shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes I774a0711,I0b4fd670,Ia09935e5

* changes:
  Fix compilation on OS/2
  Use wcslen() instead of std::wcslen()
  Fix compilation on OS/2

--- a/third_party/googletest/README.libvpx

+++ b/third_party/googletest/README.libvpx

@@ -24,3 +24,5 @@

 - Make WithParamInterface<T>::GetParam static in order to avoid

   initialization issues

   https://github.com/google/googletest/pull/1830

+- Use wcslen() instead of std::wcslen()

+  https://github.com/google/googletest/pull/1899

--- a/third_party/googletest/src/src/gtest-printers.cc

+++ b/third_party/googletest/src/src/gtest-printers.cc

@@ -349,7 +349,7 @@

     *os << "NULL";

   } else {

     *os << ImplicitCast_<const void*>(s) << " pointing to ";

-    PrintCharsAsStringTo(s, std::wcslen(s), os);

+    PrintCharsAsStringTo(s, wcslen(s), os);

   }

 }

 #endif  // wchar_t is native

--- a/tools_common.h

+++ b/tools_common.h

@@ -33,6 +33,7 @@

 #define ftello ftello64

 typedef off64_t FileOffset;

 #elif CONFIG_OS_SUPPORT

+#include <sys/types.h> /* NOLINT */

 typedef off_t FileOffset;

 /* Use 32-bit file operations in WebM file format when building ARM

  * executables (.axf) with RVCT. */

--- a/vpx_util/vpx_thread.h

+++ b/vpx_util/vpx_thread.h

@@ -219,6 +219,11 @@

 #include <stdlib.h>       // NOLINT

 #include <sys/builtin.h>  // NOLINT

+#if defined(__STRICT_ANSI__)

+// _beginthread() is not declared on __STRICT_ANSI__ mode. Declare here.

+int _beginthread(void (*)(void *), void *, unsigned, void *);

+#endif

+

 #define pthread_t TID

 #define pthread_mutex_t HMTX