diff options
| author |  Yang Gao <yangg@google.com> | 2018-02-08 15:28:37 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-08 15:28:37 -0800 |
| commit | 0819ff56f5b7bed6a351db8913d7bb75be0e4d95 (patch) | |
| tree | 530d79784d027ae7bb8fdaa384e370b2cff690b6 | |
| parent | 6ec9bb87620ab165481ef5572ee06b351f415966 (diff) | |
| parent | 3c6e1fff8cd3067f3371cb37e7957e192191ce60 (diff) | |
Merge pull request #14383 from yang-g/sanity
restore sanity
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | gRPC-C++.podspec | 4 |
3 files changed, 4 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eb620fb6d8..6648bbcf3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1681,10 +1681,6 @@ foreach(_hdr include/grpc/support/sync_windows.h include/grpc/support/thd.h include/grpc/support/time.h - include/grpc/support/tls.h - include/grpc/support/tls_gcc.h - include/grpc/support/tls_msvc.h - include/grpc/support/tls_pthread.h include/grpc/support/useful.h include/grpc/impl/codegen/atm.h include/grpc/impl/codegen/atm_gcc_atomic.h @@ -1973,10 +1969,6 @@ foreach(_hdr include/grpc/support/sync_windows.h include/grpc/support/thd.h include/grpc/support/time.h - include/grpc/support/tls.h - include/grpc/support/tls_gcc.h - include/grpc/support/tls_msvc.h - include/grpc/support/tls_pthread.h include/grpc/support/useful.h include/grpc/impl/codegen/atm.h include/grpc/impl/codegen/atm_gcc_atomic.h @@ -3882,10 +3882,6 @@ PUBLIC_HEADERS_C += \ include/grpc/support/sync_windows.h \ include/grpc/support/thd.h \ include/grpc/support/time.h \ - include/grpc/support/tls.h \ - include/grpc/support/tls_gcc.h \ - include/grpc/support/tls_msvc.h \ - include/grpc/support/tls_pthread.h \ include/grpc/support/useful.h \ include/grpc/impl/codegen/atm.h \ include/grpc/impl/codegen/atm_gcc_atomic.h \ @@ -4167,10 +4163,6 @@ PUBLIC_HEADERS_C += \ include/grpc/support/sync_windows.h \ include/grpc/support/thd.h \ include/grpc/support/time.h \ - include/grpc/support/tls.h \ - include/grpc/support/tls_gcc.h \ - include/grpc/support/tls_msvc.h \ - include/grpc/support/tls_pthread.h \ include/grpc/support/useful.h \ include/grpc/impl/codegen/atm.h \ include/grpc/impl/codegen/atm_gcc_atomic.h \ diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index fa6bb73a22..945b1b210a 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -652,6 +652,10 @@ Pod::Spec.new do |s| 'src/core/lib/gpr/string_windows.h', 'src/core/lib/gpr/thd_internal.h', 'src/core/lib/gpr/time_precise.h', + 'src/core/lib/gpr/tls.h', + 'src/core/lib/gpr/tls_gcc.h', + 'src/core/lib/gpr/tls_msvc.h', + 'src/core/lib/gpr/tls_pthread.h', 'src/core/lib/gpr/tmpfile.h', 'src/core/lib/gprpp/abstract.h', 'src/core/lib/gprpp/atomic.h', |