Add grpc submodule, update path to grpc project, minor improvements to cgrpc.h

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "External/grpc"]
-	path = External/grpc
-	url = https://github.com/grpc/grpc
+[submodule "third_party/grpc"]
+	path = third_party/grpc
+	url = git@github.com:grpc/grpc

Packages/CgRPC/Sources/cgrpc.h

@@ -39,24 +39,24 @@
 
 #ifndef cgrpc_internal_h
 // all domain types are opaque pointers
-#define cgrpc_byte_buffer                      void
-#define cgrpc_call                             void
-#define cgrpc_client                           void
-#define cgrpc_completion_queue                 void
-#define cgrpc_handler                          void
-#define cgrpc_metadata                         void
-#define cgrpc_metadata_array                   void
-#define cgrpc_mutex                            void
-#define cgrpc_observer                         void
-#define cgrpc_observer_send_initial_metadata   void
-#define cgrpc_observer_send_message            void
-#define cgrpc_observer_send_close_from_client  void
-#define cgrpc_observer_send_status_from_server void
-#define cgrpc_observer_recv_initial_metadata   void
-#define cgrpc_observer_recv_message            void
-#define cgrpc_observer_recv_status_on_client   void
-#define cgrpc_observer_recv_close_on_server    void
-#define cgrpc_server                           void
+typedef void cgrpc_byte_buffer;
+typedef void cgrpc_call;
+typedef void cgrpc_client;
+typedef void cgrpc_completion_queue;
+typedef void cgrpc_handler;
+typedef void cgrpc_metadata;
+typedef void cgrpc_metadata_array;
+typedef void cgrpc_mutex;
+typedef void cgrpc_observer;
+typedef void cgrpc_observer_send_initial_metadata;
+typedef void cgrpc_observer_send_message;
+typedef void cgrpc_observer_send_close_from_client;
+typedef void cgrpc_observer_send_status_from_server;
+typedef void cgrpc_observer_recv_initial_metadata;
+typedef void cgrpc_observer_recv_message;
+typedef void cgrpc_observer_recv_status_on_client;
+typedef void cgrpc_observer_recv_close_on_server;
+typedef void cgrpc_server;
 
 /** Result of a grpc call. If the caller satisfies the prerequisites of a
  particular operation, the grpc_call_error returned will be GRPC_CALL_OK.

gRPC.xcodeproj/project.pbxproj

@@ -240,27 +240,27 @@
 			buildActionMask = 2147483647;
 			files = (
 				D3AC86AE1D5BEBBE0042B341 /* byte_buffer.c in Sources */,
-				D3AC86C81D5BEBE00042B341 /* CompletionQueue.swift in Sources */,
-				D3AC86C61D5BEBE00042B341 /* Call.swift in Sources */,
+				D3AC86AF1D5BEBBE0042B341 /* call.c in Sources */,
+				D3AC86B01D5BEBBE0042B341 /* client.c in Sources */,
 				D3AC86B11D5BEBBE0042B341 /* completion_queue.c in Sources */,
+				D3AC86B21D5BEBBE0042B341 /* handler.c in Sources */,
 				D3AC86B31D5BEBBE0042B341 /* internal.c in Sources */,
+				D3AC86B51D5BEBBE0042B341 /* metadata.c in Sources */,
+				D3AC86B61D5BEBBE0042B341 /* mutex.c in Sources */,
+				D3AC86B71D5BEBBE0042B341 /* observers.c in Sources */,
+				D3AC86B81D5BEBBE0042B341 /* server.c in Sources */,
+				D3AC86C81D5BEBE00042B341 /* CompletionQueue.swift in Sources */,
+				D3AC86C61D5BEBE00042B341 /* Call.swift in Sources */,
 				D3AC86CB1D5BEBE00042B341 /* Metadata.swift in Sources */,
 				D310E3C71D5D8CD8002D48D0 /* Writable.swift in Sources */,
 				D3AC86C91D5BEBE00042B341 /* gRPC.swift in Sources */,
 				D3AC86CA1D5BEBE00042B341 /* Handler.swift in Sources */,
 				D3AC86CD1D5BEBE00042B341 /* Operation.swift in Sources */,
-				D3AC86B71D5BEBBE0042B341 /* observers.c in Sources */,
 				D310E3C21D5D8B89002D48D0 /* Writer.swift in Sources */,
 				D32F10121D5CEE880071B7C1 /* CallResponse.swift in Sources */,
 				D3AC86CE1D5BEBE00042B341 /* Server.swift in Sources */,
-				D3AC86B61D5BEBBE0042B341 /* mutex.c in Sources */,
 				D3AC86C71D5BEBE00042B341 /* Client.swift in Sources */,
 				D3AC86C51D5BEBE00042B341 /* ByteBuffer.swift in Sources */,
-				D3AC86B21D5BEBBE0042B341 /* handler.c in Sources */,
-				D3AC86AF1D5BEBBE0042B341 /* call.c in Sources */,
-				D3AC86B51D5BEBBE0042B341 /* metadata.c in Sources */,
-				D3AC86B81D5BEBBE0042B341 /* server.c in Sources */,
-				D3AC86B01D5BEBBE0042B341 /* client.c in Sources */,
 				D3AC86CC1D5BEBE00042B341 /* Mutex.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -373,11 +373,11 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				HEADER_SEARCH_PATHS = ../../include;
+				HEADER_SEARCH_PATHS = third_party/grpc/include;
 				INFOPLIST_FILE = gRPC/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = ../../libs/opt;
+				LIBRARY_SEARCH_PATHS = third_party/grpc/libs/opt;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.gRPC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -398,11 +398,11 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				HEADER_SEARCH_PATHS = ../../include;
+				HEADER_SEARCH_PATHS = third_party/grpc/include;
 				INFOPLIST_FILE = gRPC/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = ../../libs/opt;
+				LIBRARY_SEARCH_PATHS = third_party/grpc/libs/opt;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.gRPC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

third_party/grpc

@@ -0,0 +1 @@
+Subproject commit b6528c59a9a87ae5926ac9e4a11226a4ce490b36