diff options
| author |  Muxi Yan <mxyan@google.com> | 2018-06-05 09:42:33 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2018-06-05 16:44:20 -0700 |
| commit | c512b4f039f0c5cb503b9aa130c617969dd741ce (patch) | |
| tree | 608f01c4efa40e4e0be820e138cc09b6100a51ed /src/core/lib/iomgr | |
| parent | 72f7159546fb1e993151935f6eef1eaade2c9126 (diff) | |
revert -framework CoreFoundation
Make error CFStream only
Diffstat (limited to 'src/core/lib/iomgr')
| -rw-r--r-- | src/core/lib/iomgr/endpoint_cfstream.cc | 2 | ||||
| -rw-r--r-- | src/core/lib/iomgr/error_cfstream.cc (renamed from src/core/lib/iomgr/error_apple.cc) | 4 | ||||
| -rw-r--r-- | src/core/lib/iomgr/error_cfstream.h (renamed from src/core/lib/iomgr/error_apple.h) | 6 | ||||
| -rw-r--r-- | src/core/lib/iomgr/tcp_client_cfstream.cc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/lib/iomgr/endpoint_cfstream.cc b/src/core/lib/iomgr/endpoint_cfstream.cc index 6525a02fbb..c3bc0cc8fd 100644 --- a/src/core/lib/iomgr/endpoint_cfstream.cc +++ b/src/core/lib/iomgr/endpoint_cfstream.cc @@ -33,7 +33,7 @@ #include "src/core/lib/iomgr/cfstream_handle.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" -#include "src/core/lib/iomgr/error_apple.h" +#include "src/core/lib/iomgr/error_cfstream.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/src/core/lib/iomgr/error_apple.cc b/src/core/lib/iomgr/error_cfstream.cc index bc375bae88..d7af8c377f 100644 --- a/src/core/lib/iomgr/error_apple.cc +++ b/src/core/lib/iomgr/error_cfstream.cc @@ -18,7 +18,7 @@ #include <grpc/support/port_platform.h> -#ifdef GPR_APPLE +#ifdef GRPC_CFSTREAM #include <CoreFoundation/CoreFoundation.h> #include <grpc/support/alloc.h> @@ -49,4 +49,4 @@ grpc_error* grpc_error_create_from_cferror(const char* file, int line, gpr_free(error_msg); return return_error; } -#endif /* GPR_APPLE */ +#endif /* GRPC_CFSTREAM */ diff --git a/src/core/lib/iomgr/error_apple.h b/src/core/lib/iomgr/error_cfstream.h index 276ec77d35..06ab751329 100644 --- a/src/core/lib/iomgr/error_apple.h +++ b/src/core/lib/iomgr/error_cfstream.h @@ -16,8 +16,8 @@ * */ -#ifndef GRPC_CORE_LIB_IOMGR_ERROR_APPLE_H -#define GRPC_CORE_LIB_IOMGR_ERROR_APPLE_H +#ifndef GRPC_CORE_LIB_IOMGR_ERROR_CFSTREAM_H +#define GRPC_CORE_LIB_IOMGR_ERROR_CFSTREAM_H #ifdef GRPC_CFSTREAM // Create an error from Apple Core Foundation CFError object @@ -28,4 +28,4 @@ grpc_error* grpc_error_create_from_cferror(const char* file, int line, void* arg, const char* desc); #endif /* GRPC_CFSTREAM */ -#endif /* GRPC_CORE_LIB_IOMGR_ERROR_APPLE_H */ +#endif /* GRPC_CORE_LIB_IOMGR_ERROR_CFSTREAM_H */ diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc index b1a40f7a30..ffed3bbef6 100644 --- a/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -39,7 +39,7 @@ #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint_cfstream.h" #include "src/core/lib/iomgr/error.h" -#include "src/core/lib/iomgr/error_apple.h" +#include "src/core/lib/iomgr/error_cfstream.h" #include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/timer.h" |