diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-08 07:46:46 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-08 07:46:46 -0700 |
| commit | fee0cfa0d51078b0cbc398afdb3e552355ad7402 (patch) | |
| tree | 5ed54f4f4e9e7d556ac618d3252a35b18e905d67 /include | |
| parent | 4d706b8dbc042fa758d63e4e3e18ef9ced5c499b (diff) | |
| parent | f4d4ae0dd5c5faf1901f63ff05a52880512610d9 (diff) | |
Merge github.com:grpc/grpc into churn-churn-churn-the-api-gently-down-the-stream
Conflicts:
src/cpp/server/server.cc
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/grpc.h | 4 | ||||
| -rw-r--r-- | include/grpc/support/port_platform.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index be12356414..0212b42188 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -140,7 +140,9 @@ typedef enum grpc_call_error { /* there is already an outstanding read/write operation on the call */ GRPC_CALL_ERROR_TOO_MANY_OPERATIONS, /* the flags value was illegal for this call */ - GRPC_CALL_ERROR_INVALID_FLAGS + GRPC_CALL_ERROR_INVALID_FLAGS, + /* invalid metadata was passed to this call */ + GRPC_CALL_ERROR_INVALID_METADATA } grpc_call_error; /* Result of a grpc operation */ diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h index 671648a976..df7861c7b6 100644 --- a/include/grpc/support/port_platform.h +++ b/include/grpc/support/port_platform.h @@ -80,6 +80,7 @@ #define GPR_POSIX_SYNC 1 #define GPR_POSIX_TIME 1 #define GPR_GETPID_IN_UNISTD_H 1 +#define GPR_HAVE_MSG_NOSIGNAL 1 #elif defined(__linux__) #ifndef _BSD_SOURCE #define _BSD_SOURCE @@ -124,6 +125,7 @@ #define GPR_POSIX_SYNC 1 #define GPR_POSIX_TIME 1 #define GPR_GETPID_IN_UNISTD_H 1 +#define GPR_HAVE_MSG_NOSIGNAL 1 #ifdef _LP64 #define GPR_ARCH_64 1 #else /* _LP64 */ @@ -155,6 +157,7 @@ #define GPR_POSIX_SYNC 1 #define GPR_POSIX_TIME 1 #define GPR_GETPID_IN_UNISTD_H 1 +#define GPR_HAVE_SO_NOSIGPIPE 1 #ifdef _LP64 #define GPR_ARCH_64 1 #else /* _LP64 */ @@ -180,6 +183,7 @@ #define GPR_POSIX_SYNC 1 #define GPR_POSIX_TIME 1 #define GPR_GETPID_IN_UNISTD_H 1 +#define GPR_HAVE_SO_NOSIGPIPE 1 #ifdef _LP64 #define GPR_ARCH_64 1 #else /* _LP64 */ |