File fix_gettid_naming_conflict.patch of Package grafana-image-renderer

Overview Repositories Revisions Requests Users Attributes Meta

File fix_gettid_naming_conflict.patch of Package grafana-image-renderer

From de6255941a5e1c2fb2d50e57f84e38c09f45023d Mon Sep 17 00:00:00 2001
From: Juanli Shen <juanlishen@google.com>
Date: Fri, 23 Aug 2019 08:46:09 -0700
Subject: [PATCH] Fix gettid() naming conflict

---
 src/core/lib/gpr/log_linux.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/node_modules/grpc/deps/grpc/src/core/lib/gpr/log_linux.cc b/node_modules/grpc/deps/grpc/src/core/lib/gpr/log_linux.cc
index 561276f0c20..81026e5689b 100644
--- a/node_modules/grpc/deps/grpc/src/core/lib/gpr/log_linux.cc
+++ b/node_modules/grpc/deps/grpc/src/core/lib/gpr/log_linux.cc
@@ -40,7 +40,9 @@
 #include <time.h>
 #include <unistd.h>
 
-static long gettid(void) { return syscall(__NR_gettid); }
+// Not naming it as gettid() to avoid duplicate declarations when complied with
+// GCC 9.1.
+static long local_gettid(void) { return syscall(__NR_gettid); }
 
 void gpr_log(const char* file, int line, gpr_log_severity severity,
              const char* format, ...) {
@@ -70,7 +72,7 @@ void gpr_default_log(gpr_log_func_args* args) {
   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
   struct tm tm;
   static __thread long tid = 0;
-  if (tid == 0) tid = gettid();
+  if (tid == 0) tid = local_gettid();
 
   timer = static_cast<time_t>(now.tv_sec);
   final_slash = strrchr(args->file, '/');

Places

File fix_gettid_naming_conflict.patch of Package grafana-image-renderer

Places