mirror of
https://github.com/typesense/typesense.git
synced 2025-05-17 20:22:32 +08:00
Fix conflicting declaration of C function in brpc.
This commit is contained in:
parent
d3f9f64ef2
commit
10ba8f72bf
@ -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 = [
|
||||
|
Loading…
x
Reference in New Issue
Block a user