Standards compliance changes to fix QNX build.
git-svn-id: http://googletest.googlecode.com/svn/trunk@678 861a406c-534a-0410-8894-cb66d6ee9925
diff --git a/src/gtest-port.cc b/src/gtest-port.cc
index 0c4df5f..a43f33d 100644
--- a/src/gtest-port.cc
+++ b/src/gtest-port.cc
@@ -53,6 +53,7 @@
#if GTEST_OS_QNX
# include <devctl.h>
+# include <fcntl.h>
# include <sys/procfs.h>
#endif // GTEST_OS_QNX
diff --git a/src/gtest-printers.cc b/src/gtest-printers.cc
index 29c799a..bb794ee 100644
--- a/src/gtest-printers.cc
+++ b/src/gtest-printers.cc
@@ -45,6 +45,7 @@
#include "gtest/gtest-printers.h"
#include <ctype.h>
#include <stdio.h>
+#include <cwchar>
#include <ostream> // NOLINT
#include <string>
#include "gtest/internal/gtest-port.h"
@@ -335,7 +336,7 @@
*os << "NULL";
} else {
*os << ImplicitCast_<const void*>(s) << " pointing to ";
- PrintCharsAsStringTo(s, wcslen(s), os);
+ PrintCharsAsStringTo(s, std::wcslen(s), os);
}
}
#endif // wchar_t is native
