diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | mach/Makefile | 3 | ||||
| -rw-r--r-- | mach/hello.c | 47 | ||||
| -rw-r--r-- | posix/getopt.h | 9 |
4 files changed, 20 insertions, 53 deletions
diff --git a/ChangeLog b/ChangeLog index 57cde827d1..c3b7232cdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +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. + 2001-08-22 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. diff --git a/mach/Makefile b/mach/Makefile index 6494fdeedb..7e32034bc4 100644 --- a/mach/Makefile +++ b/mach/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc. +# Copyright (C) 1991,92,93,94,95,96,97,98,2001 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -51,7 +51,6 @@ mach/mach_interface.defs = mach/mach.defs # Similarly for memory_object_user vs. memory_object mach/memory_object_user.defs = mach/memory_object.defs server-interfaces := mach/exc -tests := hello # It is important that we do not use the wildcard function to expand # `err_*.sub'. Leaving the wildcard allows Make-dist to find all matching # files in all sysdep directories. diff --git a/mach/hello.c b/mach/hello.c deleted file mode 100644 index 4003b8d2db..0000000000 --- a/mach/hello.c +++ /dev/null @@ -1,47 +0,0 @@ -/* "Hello world" program for GNU C Library on bare Mach 3.0. - Copyright (C) 1991, 1992, 1993, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <mach.h> -#include <device/device.h> -#include <errno.h> -#include <stdio.h> - -int -main (void) -{ - kern_return_t err; - mach_port_t device, consdev; - FILE *consf; - - err = get_privileged_ports (NULL, &device); - if (err) - _exit (err); - err = device_open (device, D_WRITE, "console", &consdev); - mach_port_deallocate (mach_task_self (), device); - if (err) - _exit (err); - - consf = mach_open_devstream (consdev, "w"); - if (consf == NULL) - exit (errno); - - fputs ("Hello, world!\n", consf); - - return 0; -} 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); |