From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1499) id 2D93D3858D37; Thu, 20 Jan 2022 17:32:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2D93D3858D37 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Gaius Mulley To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/modula-2] Correct module name component in global symbols. X-Act-Checkin: gcc X-Git-Author: Gaius Mulley X-Git-Refname: refs/heads/devel/modula-2 X-Git-Oldrev: c4d5b401d1854d206b07bad132e49063d6fafcd6 X-Git-Newrev: 2525979b7b8d37266db87430c79b2ac0881c996b Message-Id: <20220120173221.2D93D3858D37@sourceware.org> Date: Thu, 20 Jan 2022 17:32:21 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jan 2022 17:32:21 -0000 https://gcc.gnu.org/g:2525979b7b8d37266db87430c79b2ac0881c996b commit 2525979b7b8d37266db87430c79b2ac0881c996b Author: Gaius Mulley Date: Thu Jan 20 16:53:04 2022 +0000 Correct module name component in global symbols. 2022-20-20 Rainer Orth libgm2/ChangeLog: * cgetopt.c: Replace all occurrences of getopt_ with cgetopt_ to conform to the Modula-2 naming scheme. Signed-off-by: Gaius Mulley Diff: --- libgm2/libm2pim/cgetopt.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/libgm2/libm2pim/cgetopt.c b/libgm2/libm2pim/cgetopt.c index e76e4e15de6..0b69379a766 100644 --- a/libgm2/libm2pim/cgetopt.c +++ b/libgm2/libm2pim/cgetopt.c @@ -28,20 +28,20 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include #include -char *getopt_optarg; -int getopt_optind; -int getopt_opterr; -int getopt_optopt; +char *cgetopt_optarg; +int cgetopt_optind; +int cgetopt_opterr; +int cgetopt_optopt; char -getopt_getopt (int argc, char *argv[], char *optstring) +cgetopt_getopt (int argc, char *argv[], char *optstring) { char r = getopt (argc, argv, optstring); - getopt_optarg = optarg; - getopt_optind = optind; - getopt_opterr = opterr; - getopt_optopt = optopt; + cgetopt_optarg = optarg; + cgetopt_optind = optind; + cgetopt_opterr = opterr; + cgetopt_optopt = optopt; if (r == (char)-1) return (char)0; @@ -49,29 +49,29 @@ getopt_getopt (int argc, char *argv[], char *optstring) } int -getopt_getopt_long (int argc, char *argv[], char *optstring, +cgetopt_getopt_long (int argc, char *argv[], char *optstring, const struct option *longopts, int *longindex) { int r = getopt_long (argc, argv, optstring, longopts, longindex); - getopt_optarg = optarg; - getopt_optind = optind; - getopt_opterr = opterr; - getopt_optopt = optopt; + cgetopt_optarg = optarg; + cgetopt_optind = optind; + cgetopt_opterr = opterr; + cgetopt_optopt = optopt; return r; } int -getopt_getopt_long_only (int argc, char *argv[], char *optstring, +cgetopt_getopt_long_only (int argc, char *argv[], char *optstring, const struct option *longopts, int *longindex) { int r = getopt_long_only (argc, argv, optstring, longopts, longindex); - getopt_optarg = optarg; - getopt_optind = optind; - getopt_opterr = opterr; - getopt_optopt = optopt; + cgetopt_optarg = optarg; + cgetopt_optind = optind; + cgetopt_opterr = opterr; + cgetopt_optopt = optopt; return r; }