From: Jim Meyering <meyering@fb.com>
Date: Sun, 25 May 2014 16:44:39 +0000 (-0700)
Subject: build: uname: avoid shadowing warning
X-Git-Tag: v8.23~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b50186ef7d6a41d950879ef9b0183f69c8f60ae3;p=thirdparty%2Fcoreutils.git

build: uname: avoid shadowing warning

* src/uname.c (main) [__APPLE__]: Rename inner "s" to "cs",
to avoid gcc shadowing warning.
---

diff --git a/src/uname.c b/src/uname.c
index e6980ba05e..e3bed488cc 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -321,9 +321,9 @@ main (int argc, char **argv)
           if (element == unknown)
             {
               cpu_type_t cputype;
-              size_t s = sizeof cputype;
+              size_t cs = sizeof cputype;
               NXArchInfo const *ai;
-              if (sysctlbyname ("hw.cputype", &cputype, &s, NULL, 0) == 0
+              if (sysctlbyname ("hw.cputype", &cputype, &cs, NULL, 0) == 0
                   && (ai = NXGetArchInfoFromCpuType (cputype,
                                                      CPU_SUBTYPE_MULTIPLE))
                   != NULL)