public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/modula-2] Change all source file references of the module getopt to cgetopt.
@ 2021-08-12 17:10 Gaius Mulley
0 siblings, 0 replies; only message in thread
From: Gaius Mulley @ 2021-08-12 17:10 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:0593d8a6698a5b75a5801aa4c985fd8bb9074f6c
commit 0593d8a6698a5b75a5801aa4c985fd8bb9074f6c
Author: Gaius Mulley <gaius.mulley@southwales.ac.uk>
Date: Thu Aug 12 18:07:34 2021 +0100
Change all source file references of the module getopt to cgetopt.
2021-08-12 Gaius Mulley <gaius.mulley@southwales.ac.uk>
gcc/m2/ChangeLog:
* m2/gm2-libs/GetOpt.mod: Rename the getopt module with cgetopt
to avoid a clash of source filenames in the gcc tree.
Signed-off-by: Gaius Mulley <gaius.mulley@southwales.ac.uk>
Diff:
---
gcc/m2/gm2-libs/GetOpt.mod | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/gcc/m2/gm2-libs/GetOpt.mod b/gcc/m2/gm2-libs/GetOpt.mod
index f41a524f48c..dc4ba1be57e 100644
--- a/gcc/m2/gm2-libs/GetOpt.mod
+++ b/gcc/m2/gm2-libs/GetOpt.mod
@@ -30,7 +30,7 @@ FROM DynamicStrings IMPORT string, InitStringCharStar ;
FROM Storage IMPORT ALLOCATE, REALLOCATE, DEALLOCATE ;
FROM MemUtils IMPORT MemCopy ;
-IMPORT getopt ;
+IMPORT cgetopt ;
TYPE
@@ -61,10 +61,10 @@ PROCEDURE GetOpt (argc: INTEGER; argv: ADDRESS; optstring: String;
VAR
r: CHAR ;
BEGIN
- r := getopt.getopt (argc, argv, string (optstring)) ;
- optarg := InitStringCharStar (getopt.optarg) ;
- opterr := getopt.opterr ;
- optopt := getopt.optopt ;
+ r := cgetopt.getopt (argc, argv, string (optstring)) ;
+ optarg := InitStringCharStar (cgetopt.optarg) ;
+ opterr := cgetopt.opterr ;
+ optopt := cgetopt.optopt ;
RETURN r
END GetOpt ;
@@ -189,7 +189,7 @@ PROCEDURE GetOptLong (argc: INTEGER; argv: ADDRESS; optstring: String;
VAR
r: INTEGER ;
BEGIN
- r := getopt.getopt_long (argc, argv, string (optstring), longopts^.cptr, longindex) ;
+ r := cgetopt.getopt_long (argc, argv, string (optstring), longopts^.cptr, longindex) ;
RETURN r
END GetOptLong ;
@@ -204,7 +204,7 @@ PROCEDURE GetOptLongOnly (argc: INTEGER; argv: ADDRESS; optstring: String;
VAR
r: INTEGER ;
BEGIN
- r := getopt.getopt_long_only (argc, argv, string (optstring),
+ r := cgetopt.getopt_long_only (argc, argv, string (optstring),
longopts^.cptr, longindex) ;
RETURN r
END GetOptLongOnly ;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-12 17:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-12 17:10 [gcc/devel/modula-2] Change all source file references of the module getopt to cgetopt Gaius Mulley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).