aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2008-12-04 20:34:50 +0000
committerkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2008-12-04 20:34:50 +0000
commit25bc5cdc9c6d2f41a03a3fcbf8d58ef1c0b7edf6 (patch)
treecd91fe48812a31b6e293fdd5740a75dceeecce0b /src
parent1ea526879c523a7d5a50478734adbab93b018e0d (diff)
downloadprotobuf-25bc5cdc9c6d2f41a03a3fcbf8d58ef1c0b7edf6.tar.gz
protobuf-25bc5cdc9c6d2f41a03a3fcbf8d58ef1c0b7edf6.tar.bz2
protobuf-25bc5cdc9c6d2f41a03a3fcbf8d58ef1c0b7edf6.zip
Support "Solaris 10 using recent Sun Studio".
Patch from Monty Taylor <monty.taylor@gmail.com>.
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/stubs/strutil.cc1
-rw-r--r--src/google/protobuf/stubs/strutil_unittest.cc1
-rw-r--r--src/gtest/gtest.cc1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/google/protobuf/stubs/strutil.cc b/src/google/protobuf/stubs/strutil.cc
index bc417344..a4764753 100644
--- a/src/google/protobuf/stubs/strutil.cc
+++ b/src/google/protobuf/stubs/strutil.cc
@@ -35,6 +35,7 @@
#include <float.h> // FLT_DIG and DBL_DIG
#include <limits>
#include <limits.h>
+#include <stdio.h>
#ifdef _WIN32
// MSVC has only _snprintf, not snprintf.
diff --git a/src/google/protobuf/stubs/strutil_unittest.cc b/src/google/protobuf/stubs/strutil_unittest.cc
index f491968c..b9c9253b 100644
--- a/src/google/protobuf/stubs/strutil_unittest.cc
+++ b/src/google/protobuf/stubs/strutil_unittest.cc
@@ -34,6 +34,7 @@
#include <google/protobuf/testing/googletest.h>
#include <gtest/gtest.h>
+#include <locale.h>
namespace google {
namespace protobuf {
diff --git a/src/gtest/gtest.cc b/src/gtest/gtest.cc
index 09a0815a..570f0cfa 100644
--- a/src/gtest/gtest.cc
+++ b/src/gtest/gtest.cc
@@ -40,6 +40,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <wchar.h>
#ifdef GTEST_OS_LINUX