diff options
| author |  Alistair Veitch <aveitch@google.com> | 2016-02-02 13:33:44 -0800 |
|---|---|---|
| committer | Alistair Veitch <aveitch@google.com> | 2016-02-02 13:33:44 -0800 |
| commit | ddb163a0e43f9225be067e244b9f06f38a3313e7 (patch) | |
| tree | 5a124afe0c7c02a09c6cb4917b6ba40dc2f3549d /include | |
| parent | a628ac9f25f72dc8dd34f49fc7c84c67add64898 (diff) | |
| parent | 71a083b1b14cf6f9844d51e7e7c3b75de16c0501 (diff) | |
merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/census.h | 1 | ||||
| -rw-r--r-- | include/grpc/impl/codegen/port_platform.h | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/grpc/census.h b/include/grpc/census.h index 5faab385b6..6313b196f2 100644 --- a/include/grpc/census.h +++ b/include/grpc/census.h @@ -505,6 +505,7 @@ typedef struct census_view census_view; @return A new census view */ + /* TODO(aveitch): consider if context is the right argument type to pass in tags. */ CENSUS_API census_view *census_view_create( diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index 30edbc7251..d5294b2efa 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -153,19 +153,14 @@ #if __GLIBC_PREREQ(2, 10) #define GPR_LINUX_SOCKETUTILS 1 #endif -#if __GLIBC_PREREQ(2, 17) -#define GPR_LINUX_ENV 1 -#endif #endif +#define GPR_LINUX_ENV 1 #ifndef GPR_LINUX_EVENTFD #define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1 #endif #ifndef GPR_LINUX_SOCKETUTILS #define GPR_POSIX_SOCKETUTILS #endif -#ifndef GPR_LINUX_ENV -#define GPR_POSIX_ENV 1 -#endif #define GPR_POSIX_FILE 1 #define GPR_POSIX_STRING 1 #define GPR_POSIX_SUBPROCESS 1 |