diff options
| author | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2013-02-25 10:39:39 +0000 |
|---|---|---|
| committer | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2013-02-25 10:39:39 +0000 |
| commit | 7f372559cc31f15e8c30694ee7329bc0082454fe (patch) | |
| tree | 43d43a78c1f8532ed2c729b60d98f73c24f0e0c1 /src/google | |
| parent | de3494fe5cbfdb75631bd07877341d56d721730c (diff) | |
| download | protobuf-7f372559cc31f15e8c30694ee7329bc0082454fe.tar.gz protobuf-7f372559cc31f15e8c30694ee7329bc0082454fe.tar.bz2 protobuf-7f372559cc31f15e8c30694ee7329bc0082454fe.zip | |
Down-integrate from internal branch
Diffstat (limited to 'src/google')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_doc_comment.h | 2 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/subprocess.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/java/java_doc_comment.h b/src/google/protobuf/compiler/java/java_doc_comment.h index f77720b6..7244d9ba 100644 --- a/src/google/protobuf/compiler/java/java_doc_comment.h +++ b/src/google/protobuf/compiler/java/java_doc_comment.h @@ -59,7 +59,7 @@ void WriteMethodDocComment(io::Printer* printer, const MethodDescriptor* method); // Exposed for testing only. -string EscapeJavadoc(const string& input); +LIBPROTOC_EXPORT string EscapeJavadoc(const string& input); } // namespace java } // namespace compiler diff --git a/src/google/protobuf/compiler/subprocess.h b/src/google/protobuf/compiler/subprocess.h index de9fce9e..00564964 100644 --- a/src/google/protobuf/compiler/subprocess.h +++ b/src/google/protobuf/compiler/subprocess.h @@ -53,7 +53,7 @@ class Message; namespace compiler { // Utility class for launching sub-processes. -class Subprocess { +class LIBPROTOC_EXPORT Subprocess { public: Subprocess(); ~Subprocess(); |