Merge with master

1 files changed, 9 insertions, 13 deletions

diff --git a/test/core/util/passthru_endpoint.h b/test/core/util/passthru_endpoint.h
index 6d28c2cbcd..bddd8ea6a2 100644
--- a/test/core/util/passthru_endpoint.h
+++ b/test/core/util/passthru_endpoint.h
@@ -19,21 +19,17 @@
 #ifndef MOCK_ENDPOINT_H
 #define MOCK_ENDPOINT_H
 
-#include "src/core/lib/iomgr/endpoint.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <grpc/support/atm.h>
 
-typedef struct { int num_writes; } grpc_passthru_endpoint_stats;
+#include "src/core/lib/iomgr/endpoint.h"
 
-void grpc_passthru_endpoint_create(grpc_endpoint **client,
-                                   grpc_endpoint **server,
-                                   grpc_resource_quota *resource_quota,
-                                   grpc_passthru_endpoint_stats *stats);
+typedef struct {
+  gpr_atm num_writes;
+} grpc_passthru_endpoint_stats;
 
-#ifdef __cplusplus
-}
-#endif
+void grpc_passthru_endpoint_create(grpc_endpoint** client,
+                                   grpc_endpoint** server,
+                                   grpc_resource_quota* resource_quota,
+                                   grpc_passthru_endpoint_stats* stats);
 
 #endif