From 714bf4f222c35f8bde9c7b813151f5b52a79731a Mon Sep 17 00:00:00 2001 From: Vladimir Mezentsev Date: Mon, 29 Jul 2024 14:15:01 -0700 Subject: gprofng: 32018 Compilation of binutils 2.43 failed on CentOS 6 strchr is redefined as a macro in /usr/include/bits/string.h on CentOS 6/7. In this case, we may not use our CALL_UTIL macro for strchr. Use __collector_strchr instead of "CALL_UTIL (strchr)". gprofng/ChangeLog 2024-07-28 Vladimir Mezentsev PR 32018 * libcollector/hwprofile.c (open_experiment): Use __collector_strchr. --- gprofng/libcollector/hwprofile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gprofng/libcollector/hwprofile.c b/gprofng/libcollector/hwprofile.c index cfe0d84..3b7f484 100644 --- a/gprofng/libcollector/hwprofile.c +++ b/gprofng/libcollector/hwprofile.c @@ -216,13 +216,13 @@ open_experiment (const char *exp) params += 2; break; } - params = CALL_UTIL (strchr)(params, ';'); + params = __collector_strchr (params, ';'); if (params) params++; } if (params == NULL) /* HWC profiling not specified */ return COL_ERROR_HWCINIT; - char *s = CALL_UTIL (strchr)(params, (int) ';'); + char *s = __collector_strchr (params, (int) ';'); int sz = s ? s - params : CALL_UTIL (strlen)(params); char *defstring = (char*) alloca (sz + 1); CALL_UTIL (strlcpy)(defstring, params, sz + 1); -- cgit v1.1