| Index: third_party/grpc/include/grpc/support/atm_gcc_atomic.h
|
| diff --git a/third_party/tcmalloc/chromium/src/google/heap-profiler.h b/third_party/grpc/include/grpc/support/atm_gcc_atomic.h
|
| similarity index 86%
|
| copy from third_party/tcmalloc/chromium/src/google/heap-profiler.h
|
| copy to third_party/grpc/include/grpc/support/atm_gcc_atomic.h
|
| index be4395964f4767213744627b8a982d66de4f52c3..7e1f7fd55a575b991d7945aeb532acdc23a6f43c 100644
|
| --- a/third_party/tcmalloc/chromium/src/google/heap-profiler.h
|
| +++ b/third_party/grpc/include/grpc/support/atm_gcc_atomic.h
|
| @@ -1,10 +1,12 @@
|
| -/* Copyright (c) 2005, Google Inc.
|
| +/*
|
| + *
|
| + * Copyright 2015-2016, Google Inc.
|
| * All rights reserved.
|
| - *
|
| + *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are
|
| * met:
|
| - *
|
| + *
|
| * * Redistributions of source code must retain the above copyright
|
| * notice, this list of conditions and the following disclaimer.
|
| * * Redistributions in binary form must reproduce the above
|
| @@ -14,7 +16,7 @@
|
| * * Neither the name of Google Inc. nor the names of its
|
| * contributors may be used to endorse or promote products derived from
|
| * this software without specific prior written permission.
|
| - *
|
| + *
|
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| @@ -26,9 +28,12 @@
|
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + *
|
| */
|
|
|
| -/* The code has moved to gperftools/. Use that include-directory for
|
| - * new code.
|
| - */
|
| -#include <gperftools/heap-profiler.h>
|
| +#ifndef GRPC_IMPL_CODEGEN_ATM_GCC_ATOMIC_H
|
| +#define GRPC_IMPL_CODEGEN_ATM_GCC_ATOMIC_H
|
| +
|
| +#include <grpc/impl/codegen/atm_gcc_atomic.h>
|
| +
|
| +#endif /* GRPC_IMPL_CODEGEN_ATM_GCC_ATOMIC_H */
|
|
|