From 4c7a3c1350687d2913a2e008c2c41deceedcdead Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 28 Sep 2019 18:01:32 +0300 Subject: Adapt to renaming butl::casecmp() to icasecmp() --- libbuild2/cc/common.cxx | 2 +- libbuild2/cc/compile-rule.cxx | 2 +- libbuild2/cc/link-rule.cxx | 2 +- libbuild2/cc/msvc.cxx | 4 ++-- libbuild2/cc/windows-rpath.cxx | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'libbuild2/cc') diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx index bfcb00c..7d929a8 100644 --- a/libbuild2/cc/common.cxx +++ b/libbuild2/cc/common.cxx @@ -985,7 +985,7 @@ namespace build2 // /LIBPATH: (case-insensitive). // if ((o[0] == '/' || o[0] == '-') && - casecmp (o.c_str () + 1, "LIBPATH:", 8) == 0) + icasecmp (o.c_str () + 1, "LIBPATH:", 8) == 0) d = dir_path (o, 9, string::npos); else continue; diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx index d6adfd3..ac052b1 100644 --- a/libbuild2/cc/compile-rule.cxx +++ b/libbuild2/cc/compile-rule.cxx @@ -4558,7 +4558,7 @@ namespace build2 fc = f[fi - 1]; mc = m[mi - 1]; - if (casecmp (fc, mc) == 0) + if (icasecmp (fc, mc) == 0) { fsep = msep = false; continue; diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx index 14e5b94..fb7588b 100644 --- a/libbuild2/cc/link-rule.cxx +++ b/libbuild2/cc/link-rule.cxx @@ -1762,7 +1762,7 @@ namespace build2 if ((c ? f.compare (p, string::npos, e) - : casecmp (f.c_str () + p, e)) != 0) + : icasecmp (f.c_str () + p, e)) != 0) return; } diff --git a/libbuild2/cc/msvc.cxx b/libbuild2/cc/msvc.cxx index d802b98..2d53b69 100644 --- a/libbuild2/cc/msvc.cxx +++ b/libbuild2/cc/msvc.cxx @@ -318,10 +318,10 @@ namespace build2 { const char* e (s.c_str () + n + 1); - if (casecmp (e, "obj", 3) == 0) + if (icasecmp (e, "obj", 3) == 0) obj = true; - if (casecmp (e, "dll", 3) == 0) + if (icasecmp (e, "dll", 3) == 0) dll = true; } } diff --git a/libbuild2/cc/windows-rpath.cxx b/libbuild2/cc/windows-rpath.cxx index 5583315..b5d82b1 100644 --- a/libbuild2/cc/windows-rpath.cxx +++ b/libbuild2/cc/windows-rpath.cxx @@ -94,7 +94,7 @@ namespace build2 // size_t p (path::traits_type::find_extension (f)); - if (p == string::npos || casecmp (f.c_str () + p + 1, "dll") != 0) + if (p == string::npos || icasecmp (f.c_str () + p + 1, "dll") != 0) return; } @@ -172,7 +172,7 @@ namespace build2 { size_t p (path::traits_type::find_extension (f)); - if (p != string::npos && casecmp (f.c_str () + p + 1, "dll") == 0) + if (p != string::npos && icasecmp (f.c_str () + p + 1, "dll") == 0) { // See if we can find a corresponding .pdb. // -- cgit v1.1