aboutsummaryrefslogtreecommitdiff
path: root/ruby/ext/google/protobuf_c/protobuf.h
diff options
context:
space:
mode:
authorJon Skeet <skeet@pobox.com>2015-07-21 12:58:43 +0100
committerJon Skeet <skeet@pobox.com>2015-07-21 12:58:43 +0100
commit2ee4b5665520fe3245eb5e15df8bd35e0c539a07 (patch)
treef5e81c7ea4d414c6a388ebc86ab62175240660d1 /ruby/ext/google/protobuf_c/protobuf.h
parentc792db5d0878871d8f2f78cf12c7e597060088c8 (diff)
parent353b7a99857442c7c64a56111b3910b63237ccc8 (diff)
downloadprotobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.tar.gz
protobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.tar.bz2
protobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.zip
Merge pull request #629 from google/master
Integrate changes from upstream/master into csharp-experimental
Diffstat (limited to 'ruby/ext/google/protobuf_c/protobuf.h')
-rw-r--r--ruby/ext/google/protobuf_c/protobuf.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/ruby/ext/google/protobuf_c/protobuf.h b/ruby/ext/google/protobuf_c/protobuf.h
index f8667486..8750c93d 100644
--- a/ruby/ext/google/protobuf_c/protobuf.h
+++ b/ruby/ext/google/protobuf_c/protobuf.h
@@ -161,6 +161,9 @@ extern VALUE cOneofBuilderContext;
extern VALUE cEnumBuilderContext;
extern VALUE cBuilder;
+extern VALUE cError;
+extern VALUE cParseError;
+
// We forward-declare all of the Ruby method implementations here because we
// sometimes call the methods directly across .c files, rather than going
// through Ruby's method dispatching (e.g. during message parse). It's cleaner