diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-08 10:21:11 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-08 10:21:11 -0800 |
| commit | 573717bc8d7aea0eedb5fa33083bcbc38f59159b (patch) | |
| tree | 92139d50dd48fea3f347cbbe3df1af1f7c9d7335 /tools/doxygen | |
| parent | 32748c1b2aff43af72b643219fc843f501cb626f (diff) | |
| parent | 7bd5e18fea0201fed3edd74e3c3d7caf9040609c (diff) | |
Merge branch 'master' into gpr_review3
Diffstat (limited to 'tools/doxygen')
| -rw-r--r-- | tools/doxygen/Doxyfile.c++ | 1 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.c++.internal | 2 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.core | 1 | ||||
| -rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index 68c7c9205e..bf739857ff 100644 --- a/tools/doxygen/Doxyfile.c++ +++ b/tools/doxygen/Doxyfile.c++ @@ -911,7 +911,6 @@ include/grpc/support/atm_gcc_sync.h \ include/grpc/support/atm_windows.h \ include/grpc/support/avl.h \ include/grpc/support/cpu.h \ -include/grpc/support/host_port.h \ include/grpc/support/log.h \ include/grpc/support/log_windows.h \ include/grpc/support/port_platform.h \ diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index bbd28a731b..3db9bdfae0 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -912,7 +912,6 @@ include/grpc/support/atm_gcc_sync.h \ include/grpc/support/atm_windows.h \ include/grpc/support/avl.h \ include/grpc/support/cpu.h \ -include/grpc/support/host_port.h \ include/grpc/support/log.h \ include/grpc/support/log_windows.h \ include/grpc/support/port_platform.h \ @@ -952,6 +951,7 @@ src/core/lib/debug/trace.h \ src/core/lib/gpr/arena.h \ src/core/lib/gpr/env.h \ src/core/lib/gpr/fork.h \ +src/core/lib/gpr/host_port.h \ src/core/lib/gpr/mpscq.h \ src/core/lib/gpr/murmur_hash.h \ src/core/lib/gpr/spinlock.h \ diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index 762836fedd..35f925d32a 100644 --- a/tools/doxygen/Doxyfile.core +++ b/tools/doxygen/Doxyfile.core @@ -851,7 +851,6 @@ include/grpc/support/atm_gcc_sync.h \ include/grpc/support/atm_windows.h \ include/grpc/support/avl.h \ include/grpc/support/cpu.h \ -include/grpc/support/host_port.h \ include/grpc/support/log.h \ include/grpc/support/log_windows.h \ include/grpc/support/port_platform.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 1b780b3a64..9d8a229c8c 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -851,7 +851,6 @@ include/grpc/support/atm_gcc_sync.h \ include/grpc/support/atm_windows.h \ include/grpc/support/avl.h \ include/grpc/support/cpu.h \ -include/grpc/support/host_port.h \ include/grpc/support/log.h \ include/grpc/support/log_windows.h \ include/grpc/support/port_platform.h \ @@ -1081,6 +1080,7 @@ src/core/lib/gpr/env_windows.cc \ src/core/lib/gpr/fork.cc \ src/core/lib/gpr/fork.h \ src/core/lib/gpr/host_port.cc \ +src/core/lib/gpr/host_port.h \ src/core/lib/gpr/log.cc \ src/core/lib/gpr/log_android.cc \ src/core/lib/gpr/log_linux.cc \ |