From 10ba8f72bf263cb3d32989c4f09cc9ce2965663d Mon Sep 17 00:00:00 2001 From: Kishore Nallan Date: Sun, 14 May 2023 20:16:42 +0530 Subject: [PATCH] Fix conflicting declaration of C function in brpc. --- bazel/brpc/brpc.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/bazel/brpc/brpc.patch b/bazel/brpc/brpc.patch index 0bd8874f..f686f03f 100644 --- a/bazel/brpc/brpc.patch +++ b/bazel/brpc/brpc.patch @@ -16,6 +16,18 @@ PLOG(WARNING) << "Fail to proc_pid_rusage"; return false; +--- src/butil/third_party/dynamic_annotations/dynamic_annotations.h ++++ src/butil/third_party/dynamic_annotations/dynamic_annotations.h +@@ -498,7 +498,7 @@ + const char *file, int line, const volatile void *mem, + const char *description) DYNAMIC_ANNOTATIONS_ATTRIBUTE_WEAK; + void DYNAMIC_ANNOTATIONS_NAME(AnnotateBenignRaceSized)( +- const char *file, int line, const volatile void *mem, long size, ++ const char *file, int line, const volatile void *mem, size_t size, + const char *description) DYNAMIC_ANNOTATIONS_ATTRIBUTE_WEAK; + void DYNAMIC_ANNOTATIONS_NAME(AnnotateMutexIsUsedAsCondVar)( + const char *file, int line, + --- BUILD.bazel +++ BUILD.bazel @@ -48,7 +48,7 @@ LINKOPTS = [