aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib
diff options
context:
space:
mode:
authorGravatar Yuchen Zeng <zyc@google.com>2016-10-10 16:02:56 -0700
committerGravatar Yuchen Zeng <zyc@google.com>2016-10-10 16:02:56 -0700
commitb5273fdb7354942a4deab0e2228de493ae40721e (patch)
treeb25a7776dd19b9258c7508e2055f9babb7fa97e8 /src/core/lib
parent929f4c652f5b57de016cb2cafbf81139cae30e3f (diff)
parent062ba7b8baefdc76f74fffb9aa3e2134ba047ea6 (diff)
Merge remote-tracking branch 'upstream/master' into tos
Diffstat (limited to 'src/core/lib')
-rw-r--r--src/core/lib/iomgr/error.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h
index 7e2fd7a3bd..00ace8a7a9 100644
--- a/src/core/lib/iomgr/error.h
+++ b/src/core/lib/iomgr/error.h
@@ -40,6 +40,10 @@
#include <grpc/status.h>
#include <grpc/support/time.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/// Opaque representation of an error.
/// Errors are refcounted objects that represent the result of an operation.
/// Ownership laws:
@@ -204,4 +208,8 @@ bool grpc_log_if_error(const char *what, grpc_error *error, const char *file,
#define GRPC_LOG_IF_ERROR(what, error) \
grpc_log_if_error((what), (error), __FILE__, __LINE__)
+#ifdef __cplusplus
+}
+#endif
+
#endif /* GRPC_CORE_LIB_IOMGR_ERROR_H */