about summary refs log tree commit diff
path: root/posix
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-08-22 22:24:10 +0000
committerRoland McGrath <roland@gnu.org>2001-08-22 22:24:10 +0000
commit6106611a253467a76e3b8a32548a8a1caeb529fa (patch)
treee818b640dea3509749f6057726d26f54140078a5 /posix
parent78f056dbe4063461dcf3f493b931cad2335117ae (diff)
downloadglibc-6106611a253467a76e3b8a32548a8a1caeb529fa.tar.gz
glibc-6106611a253467a76e3b8a32548a8a1caeb529fa.tar.xz
glibc-6106611a253467a76e3b8a32548a8a1caeb529fa.zip
2001-04-23 Paul Eggert <eggert@twinsun.com>
        * posix/getopt.h (getopt_long, getopt_long_only, _getopt_internal):
        Rename __argc to ___argc in prototypes to avoid compatibility
        problems with systems that reserve the identifier "__argc".
        Similarly for __argv.

2001-08-21  Roland McGrath  <roland@frob.com>

	* stdio-common/tst-fseek.c: Include <time.h> for `time' declaration.

	* mach/Makefile (tests): Removed.
	* mach/hello.c: File removed.
Diffstat (limited to 'posix')
-rw-r--r--posix/getopt.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/posix/getopt.h b/posix/getopt.h
index a1b8dd6658..4283c35b16 100644
--- a/posix/getopt.h
+++ b/posix/getopt.h
@@ -142,20 +142,21 @@ struct option
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts);
 # else /* not __GNU_LIBRARY__ */
 extern int getopt ();
 # endif /* __GNU_LIBRARY__ */
 
 # ifndef __need_getopt
-extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
+extern int getopt_long (int ___argc, char *const *___argv,
+			const char *__shortopts,
 		        const struct option *__longopts, int *__longind);
-extern int getopt_long_only (int __argc, char *const *__argv,
+extern int getopt_long_only (int ___argc, char *const *___argv,
 			     const char *__shortopts,
 		             const struct option *__longopts, int *__longind);
 
 /* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int __argc, char *const *__argv,
+extern int _getopt_internal (int ___argc, char *const *___argv,
 			     const char *__shortopts,
 		             const struct option *__longopts, int *__longind,
 			     int __long_only);