diff options
| -rw-r--r-- | docs/third_party.md | 1 | ||||
| -rw-r--r-- | python/google/protobuf/proto_api.h | 2 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/platform_macros.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/docs/third_party.md b/docs/third_party.md index 4eeb2787..2d54f679 100644 --- a/docs/third_party.md +++ b/docs/third_party.md @@ -127,6 +127,7 @@ GRPC (http://www.grpc.io/) is Google's RPC implementation for Protocol Buffers. * https://github.com/johanbrandhorst/protobuf (GopherJS) * https://github.com/awakesecurity/gRPC-haskell (Haskell) * https://github.com/Yeolar/raster (C++) +* https://github.com/jnordberg/wsrpc (JavaScript Node.js/Browser) ## Other Utilities diff --git a/python/google/protobuf/proto_api.h b/python/google/protobuf/proto_api.h index 64d8dda9..5c076d23 100644 --- a/python/google/protobuf/proto_api.h +++ b/python/google/protobuf/proto_api.h @@ -81,7 +81,7 @@ struct PyProto_API { inline const char* PyProtoAPICapsuleName() { static const char kCapsuleName[] = - "protobuf.python.google.protobuf.cpp._message.proto_API"; + "google.protobuf.pyext._message.proto_API"; return kCapsuleName; } diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h index ff4dea7b..ce1b1e36 100644 --- a/src/google/protobuf/stubs/platform_macros.h +++ b/src/google/protobuf/stubs/platform_macros.h @@ -56,7 +56,7 @@ #elif defined(__aarch64__) #define GOOGLE_PROTOBUF_ARCH_AARCH64 1 #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 -#elif defined(__MIPSEL__) +#elif defined(__mips__) #if defined(__LP64__) #define GOOGLE_PROTOBUF_ARCH_MIPS64 1 #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 |