From 145f865ce04659bf8759ac66f80ae9ef1c029d74 Mon Sep 17 00:00:00 2001
From: Jorge Canizales <jcanizales@google.com>
Date: Wed, 5 Aug 2015 19:30:45 -0700
Subject: [PATCH] =?UTF-8?q?Undo=20forward-declaring=20grpc=5Fchannel=5Farg?=
 =?UTF-8?q?s,=20which=20isn=E2=80=99t=20a=20struct!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s a typedef of an anonymous struct.
---
 src/objective-c/GRPCClient/private/GRPCSecureChannel.h | 7 ++++---
 src/objective-c/GRPCClient/private/GRPCSecureChannel.m | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/objective-c/GRPCClient/private/GRPCSecureChannel.h b/src/objective-c/GRPCClient/private/GRPCSecureChannel.h
index 40207966b55..5c93399333a 100644
--- a/src/objective-c/GRPCClient/private/GRPCSecureChannel.h
+++ b/src/objective-c/GRPCClient/private/GRPCSecureChannel.h
@@ -31,11 +31,12 @@
  *
  */
 
-struct grpc_credentials;
-struct grpc_channel_args;
+#include <grpc/grpc.h>
 
 #import "GRPCChannel.h"
 
+struct grpc_credentials;
+
 @interface GRPCSecureChannel : GRPCChannel
 - (instancetype)initWithHost:(NSString *)host;
 
@@ -47,5 +48,5 @@ struct grpc_channel_args;
 
 - (instancetype)initWithHost:(NSString *)host
                  credentials:(struct grpc_credentials *)credentials
-                        args:(struct grpc_channel_args *)args NS_DESIGNATED_INITIALIZER;
+                        args:(grpc_channel_args *)args NS_DESIGNATED_INITIALIZER;
 @end
diff --git a/src/objective-c/GRPCClient/private/GRPCSecureChannel.m b/src/objective-c/GRPCClient/private/GRPCSecureChannel.m
index 92421df9c54..310fdb67c2d 100644
--- a/src/objective-c/GRPCClient/private/GRPCSecureChannel.m
+++ b/src/objective-c/GRPCClient/private/GRPCSecureChannel.m
@@ -33,7 +33,7 @@
 
 #import "GRPCSecureChannel.h"
 
-#import <grpc/grpc_security.h>
+#include <grpc/grpc_security.h>
 
 static grpc_credentials *CertificatesAtPath(NSString *path) {
   NSData *certsData = [NSData dataWithContentsOfFile:path];