Merge pull request #186 from ennerf/win32-msvc-fix

MSVC protoc compiler fix
protocolbuffers · Feb 3, 2015 · a22bc81 · a22bc81
2 parents 17e4419 + e544b38
commit a22bc81
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/google/protobuf/compiler/ruby/ruby_generator.cc b/src/google/protobuf/compiler/ruby/ruby_generator.cc
@@ -47,7 +47,7 @@ namespace compiler {
 namespace ruby {
 
 // Forward decls.
-std::string IntToString(uint32_t value);
+std::string IntToString(uint32 value);
 std::string StripDotProto(const std::string& proto_file);
 std::string LabelForField(google::protobuf::FieldDescriptor* field);
 std::string TypeName(google::protobuf::FieldDescriptor* field);
@@ -64,7 +64,7 @@ void GenerateEnumAssignment(
     const google::protobuf::EnumDescriptor* en,
     google::protobuf::io::Printer* printer);
 
-std::string IntToString(uint32_t value) {
+std::string IntToString(uint32 value) {
   std::ostringstream os;
   os << value;
   return os.str();

diff --git a/vsprojects/libprotoc.vcproj b/vsprojects/libprotoc.vcproj
@@ -223,6 +223,10 @@
 				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_string_field.h"
 				>
 			</File>
+      <File
+				RelativePath="..\src\google\protobuf\compiler\ruby\ruby_generator.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\google\protobuf\compiler\java\java_context.h"
 				>
@@ -375,6 +379,10 @@
 				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_string_field.cc"
 				>
 			</File>
+      <File
+				RelativePath="..\src\google\protobuf\compiler\ruby\ruby_generator.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\src\google\protobuf\compiler\java\java_context.cc"
 				>